This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6613

commit: improve the files field of changelog for merges
ClosedPublic

Authored by valentin.gatienbaron on Jul 7 2019, 12:18 PM.

Details

Reviewers
mharbison72
durin42
Group Reviewers
hg-reviewers
Commits
rHG99ebde4fec99: commit: improve the files field of changelog for merges
rHGb928b229a9e7: commit: improve the files field of changelog for merges
Summary

Currently, the files list of merge commits repeats all the deletions
(either actual deletions, or files that got renamed) that happened
between base and p2 of the merge. If p2 is the main branch, the list
can easily be much bigger than the change being merged.

This results in various problems worth improving:

  • changelog is bigger than necessary
  • hg log directory lists many unrelated merge commits, and hg log -v -r commit frequently fills multiple screens worth of files
  • it possibly slows down adjustlinkrev, by forcing it to read more manifests, and that function can certainly be a bottleneck
  • the server side of pulls can waste a lot of time simply opening the filelogs for pointless files (the constant factors for opening even a tiny filelog is apparently pretty bad)

So stop listing such files as described in the code. Impacted merge
commits and their descendants get a different hash than they would
have without this. This doesn't seem problematic, except for
convert. The previous commit helped with that in the hg->hg case (but
if you do svn->hg twice from scratch, hashes can still change).

The rest of the description is numbers. I don't have much to report,
because recreating the files list of existing repositories is not
easy:

  • debugupgradeformat and bundle/unbundle don't recreate the list
  • export/import tends to choke quickly applying patches or on description that contain diffs,
  • merge commits from the convert extension don't have the right files list for reasons orthogonal to the current commit
  • replaying the merge with hg update/hg merge/hg revert --all/hg commit can end up failing in hg revert
  • I wasn't sure that using debugsetparents + debugrebuilddirstate would really build the right thing

I measured commit time before and after this change, in a case with no
files filtered out, several files filtered out (no difference) and 5k
files filtered out (+1% time).

Recreating the 100 more recent merges in a private repo, the
concatenated uncompressed files lists goes from 1.12MB to
0.52MB. Excluding 3 merges that are not representative, then the size
goes from 570k to 15k.
I converted part of mozilla-central, and observed file list shrinking
quite a bit too, starting at the very first merge, 733641d9feaf, going
from 550 files to 10 files (although they have relatively few merges,
so they probably wouldn't care).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz added a subscriber: martinvonz.Jul 8 2019, 2:03 AM

See some thoughts from me and others on https://bz.mercurial-scm.org/show_bug.cgi?id=4292. Is your goal to shrink the changelog? Or that you feel that the current behavior is incorrect? Or something else?

valentin.gatienbaron added a comment.EditedJul 8 2019, 11:03 PM

I hadn't seen the bug you linked to, or your recent change, though I saw ctx.filesadded() and friends (when writing this) and suspected they were written the way they are to work nicely on merges.

I didn't have one single goal when writing this. Hg's behavior is the source of several problems.

One problem is the size of the changelog and bundles. In part because I assume this creates slowness (hg log -u .. for instance), but also because things look broken as a result: the changelog is bigger than the manifestlog, some bundles consist almost purely of this list of files. I can't really analyze these parts of hg until this is fixed because this problem would shadow everything else.
I estimate that the changelog would be half the size with this (75% of the changelog taken by files list, 65% of uncompressed files list size come from merges, lists for merge get 60x shorter, and I assume compression ratio wouldn't get too much worse when shortening these files lists), if I could rewrite the history without changing hashes.

Then a couple of weeks ago, I looked at the speed of hg pull. I noticed that server-side hg was opening 35k filelogs when it really needed 12k (~50% server time doing that IIRC). Adding the filtering from this commit into the server-side of pull made it open 13k filelogs, which sounds like a reasonable number, and should reduce this ~50% of server time (I can't measure whether pull time would be improved given the cost of filtering on the fly, but it certainly wouldn't be any worse).

Finally, I realized that hg log can show seemingly random merge commits because of this, which makes me think this is probably causing other problems that I haven't identified yet.

valentin.gatienbaron edited the summary of this revision. (Show Details)Jul 9 2019, 6:43 AM
valentin.gatienbaron updated this revision to Diff 15830.
mharbison72 requested changes to this revision.Jul 9 2019, 12:45 PM
mharbison72 added a subscriber: mharbison72.

If this goes forward, can this be gated by a config option (even if it is on by default)? IIUC, this will change the hash for merges, and then cascade. That seems problematic for convert operations.

Most converts will do things that change hashes anyway, but the default options don't change anything. This is a convenient behavior for easily migrating to/from LFS, for example. (In theory, anyway. In practice, I've seen repos where a convert alters the changelog.) If there is a config option, convert should probably disable it by default to maintain the current behavior. I can see a use case for enabling it though, to clean up the repo.

This revision now requires changes to proceed.Jul 9 2019, 12:45 PM
valentin.gatienbaron added a comment.Jul 9 2019, 8:40 PM
In D6613#96743, @mharbison72 wrote:

If this goes forward, can this be gated by a config option (even if it is on by default)? IIUC, this will change the hash for merges, and then cascade. That seems problematic for convert operations.
Most converts will do things that change hashes anyway, but the default options don't change anything. This is a convenient behavior for easily migrating to/from LFS, for example. (In theory, anyway. In practice, I've seen repos where a convert alters the changelog.) If there is a config option, convert should probably disable it by default to maintain the current behavior. I can see a use case for enabling it though, to clean up the repo.

Given the implementation, it's easy to add a knob to disable the change. But that doesn't seem enough: If you have a repository where commits have been created with a mix of hg before and after this change, there is no single value of the knob that would make convert be the identity.

mharbison72 added a comment.Jul 10 2019, 12:09 AM
In D6613#96749, @valentin.gatienbaron wrote:
In D6613#96743, @mharbison72 wrote:

If this goes forward, can this be gated by a config option (even if it is on by default)? IIUC, this will change the hash for merges, and then cascade. That seems problematic for convert operations.
Most converts will do things that change hashes anyway, but the default options don't change anything. This is a convenient behavior for easily migrating to/from LFS, for example. (In theory, anyway. In practice, I've seen repos where a convert alters the changelog.) If there is a config option, convert should probably disable it by default to maintain the current behavior. I can see a use case for enabling it though, to clean up the repo.

Given the implementation, it's easy to add a knob to disable the change. But that doesn't seem enough: If you have a repository where commits have been created with a mix of hg before and after this change, there is no single value of the knob that would make convert be the identity.

It's not great, but at least if you know that about the repository, you can convert with it off up to the point where it switches over. Then run convert again with it on, and it will continue where it left off. Not user friendly at all, but at least there's a mechanism without having to use a hacked up copy of hg. Of course if there's a better way (maybe convert can recognize the source commit used the old way, and explicitly pass a parameter to localrepo.commitctx() to bypass this code), that would be nice.

valentin.gatienbaron added a comment.Jul 10 2019, 8:34 AM

Ok. Maybe it would be simpler or more robust to do the direct thing: optionally treat the files list in the input commit as input and reuse them blindly in the resulting commit, when doing a hg->hg conversion without filemap.
(btw, a tweak to test-merge-combinations shows the cases where convert is not the identity: 12-- and -1--, so cases where a file is absent in p1, that p2 added or modified, and the merge redeletes the file. Commit shows such files are modified (rightly) but convert doesn't)

mharbison72 added a subscriber: yuja.Jul 10 2019, 1:09 PM
In D6613#96822, @valentin.gatienbaron wrote:

Ok. Maybe it would be simpler or more robust to do the direct thing: optionally treat the files list in the input commit as input and reuse them blindly in the resulting commit, when doing a hg->hg conversion without filemap.

Maybe. I've been wondering if it's possible to just pass along the manifest and changelog instead of recalculating it. It seems there have been other issues over the years[1]. @yuja fixed something manifest related around the time of that thread IIRC. Even if a filemap is in use, the map may not modify early commits. And when those are changed unexpectedly, it makes me wonder what got lost/mangled. I looked through the repos I converted last year without any file mapping, and there were manifest node changes, but also differences in files and files+ in the changelog.

(btw, a tweak to test-merge-combinations shows the cases where convert is not the identity: 12-- and -1--, so cases where a file is absent in p1, that p2 added or modified, and the merge redeletes the file. Commit shows such files are modified (rightly) but convert doesn't)

Is that a non-tracked test? Can you throw a patch up somewhere showing this? One of the things I noticed last year was that I'd get better results if cleanp2[2] was forced to be empty. I was unable to come up with a simple test case showing a different hash with shipping code and a forcibly emptied cleanp2, circa 4.6. What you're describing seems to be the opposite of 216fa1ba9993, but something is wrong with that calculation, so maybe it's worth a try.

[1] https://www.mercurial-scm.org/pipermail/mercurial/2018-June/050921.html
[2] https://www.mercurial-scm.org/repo/hg/file/5.0.2/hgext/convert/hg.py#l552

JordiGH added a subscriber: JordiGH.Jul 10 2019, 7:33 PM
JordiGH added inline comments.
mercurial/localrepo.py
2664

Not all merges can be detected by checking for p2 being non-null; p1 being null but p2 being non-null is perfectly acceptable everywhere else, although normally hg won't produce commits like this in most circumstances.

valentin.gatienbaron added a comment.Jul 10 2019, 8:51 PM
In D6613#96908, @mharbison72 wrote:
In D6613#96822, @valentin.gatienbaron wrote:

Ok. Maybe it would be simpler or more robust to do the direct thing: optionally treat the files list in the input commit as input and reuse them blindly in the resulting commit, when doing a hg->hg conversion without filemap.

Maybe. I've been wondering if it's possible to just pass along the manifest and changelog instead of recalculating it. It seems there have been other issues over the years[1]. @yuja fixed something manifest related around the time of that thread IIRC. Even if a filemap is in use, the map may not modify early commits. And when those are changed unexpectedly, it makes me wonder what got lost/mangled. I looked through the repos I converted last year without any file mapping, and there were manifest node changes, but also differences in files and files+ in the changelog.

Ideally, the whole file list would move out the changelog. Then changing the list of modified files wouldn't change hashes anymore, but of course at the cost of changing everything once.
Given that the filelist in the commit is (ignoring changes to mercurial) a function of the manifest, it may be reasonable to make convert reuse the filelist if the manifestnode gets reused. Or to put it differently, if the conversion is the identity so far for a commit, keep behaving as the identity.

(btw, a tweak to test-merge-combinations shows the cases where convert is not the identity: 12-- and -1--, so cases where a file is absent in p1, that p2 added or modified, and the merge redeletes the file. Commit shows such files are modified (rightly) but convert doesn't)

Is that a non-tracked test? Can you throw a patch up somewhere showing this? One of the things I noticed last year was that I'd get better results if cleanp2[2] was forced to be empty. I was unable to come up with a simple test case showing a different hash with shipping code and a forcibly emptied cleanp2, circa 4.6. What you're describing seems to be the opposite of 216fa1ba9993, but something is wrong with that calculation, so maybe it's worth a try.

Saying "the cases where convert misbehaves" is probably optimistic. It shows some cases where convert misbehaves. test-merge-combination.t is in the previous differential. cleanp2 seems orthogonal, as fiddling with it doesn't change what I see. This is the tweak I was talking about (based on this differential):

diff --git a/tests/test-merge-combination.t b/tests/test-merge-combination.t
--- a/tests/test-merge-combination.t
+++ b/tests/test-merge-combination.t
@@ -58,9 +58,16 @@ revision. "C" indicates that hg merge ha
   >           else expected=a
   >           fi
   >           got=`hg log -r 3 --template '{files}\n' | tr --delete 'e '`
+  >           hg --config extensions.convert= convert . repo-convert -s hg -d hg --sourcesort -q
+  >           got2=`hg --cwd repo-convert log -r 3 --template '{files}\n' | tr --delete 'e '`
   >           if [ "$got" = "$expected" ]
-  >           then echo "$line$conflicts: agree on \"$got\""
-  >           else echo "$line$conflicts: hg said \"$got\", expected \"$expected\""
+  >           then echo -n "$line$conflicts: agree on \"$got\""
+  >           else echo -n "$line$conflicts: hg said \"$got\", expected \"$expected\""
+  >           fi
+  >           if [ "$got" = "$got2" ]; then
+  >             echo
+  >           else
+  >             echo ", commit:\"$got\" vs convert:\"$got2\""
   >           fi
   >           cd ../
   >           rm -rf repo
@@ -115,7 +122,7 @@ All the merges of various file contents.
   12-1 C: agree on "a"
   12-2 C: hg said "", expected "a"
   12-3 C: agree on "a"
-  12-- C: agree on "a"
+  12-- C: agree on "a", commit:"a" vs convert:""
   1-11  : hg said "", expected "a"
   1-12  : agree on "a"
   1-1-  : agree on ""
@@ -135,7 +142,7 @@ All the merges of various file contents.
   -12- C: agree on "a"
   -1-1  : agree on ""
   -1-2  : agree on "a"
-  -1--  : agree on "a"
+  -1--  : agree on "a", commit:"a" vs convert:""
   --11  : agree on ""
   --12  : agree on "a"
   --1-  : agree on "a"
valentin.gatienbaron added inline comments.Jul 10 2019, 9:45 PM
mercurial/localrepo.py
2664

It'd be trivial to change the code to check both parents, but I find what you say surprising. Aren't there plenty of places in hg that do checks similar to this one:

https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/context.py#l443
https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/context.py#l2414
https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/localrepo.py#l2407

JordiGH added inline comments.Jul 11 2019, 8:51 AM
mercurial/localrepo.py
2664

Hm, yes, you're right. I suppose it's a coincidence that a lot of things still work if p1 is null but p2 isn't. It's certainly not something that hg verify nor hg log complains about.

valentin.gatienbaron edited parent revisions, added: D6643: convert: add a config option to help doing identity hg->hg conversion; removed: D6612: tests: show the files fields of changelogs for many merges.Jul 14 2019, 3:15 PM
valentin.gatienbaron retitled this revision from commit: improve the files field of changelog for merges (RFC) to commit: improve the files field of changelog for merges.
valentin.gatienbaron edited the summary of this revision. (Show Details)
valentin.gatienbaron updated this revision to Diff 15905.
valentin.gatienbaron added a comment.Jul 14 2019, 3:31 PM

@mharbison72 I dealt with the problem of convert in the previous commit. I didn't add a config option to disable the new code path, because it's really awkward to document, and I think it would be annoying to use if I made more fixes (the other case where files are spuriously listed, involving exec bits, probably has little impact on repo size/pull performance but it may be worth fixing anyway because it causes confusion). But if there are downsides to what I did, the config option is still on the table.

mharbison72 accepted this revision.Jul 16 2019, 9:46 PM
In D6613#97136, @valentin.gatienbaron wrote:

@mharbison72 I dealt with the problem of convert in the previous commit. I didn't add a config option to disable the new code path, because it's really awkward to document, and I think it would be annoying to use if I made more fixes (the other case where files are spuriously listed, involving exec bits, probably has little impact on repo size/pull performance but it may be worth fixing anyway because it causes confusion). But if there are downsides to what I did, the config option is still on the table.

I'm still fuzzy on how all of the manifest stuff works in general. But it looks like the previous patch addresses my convert concerns, so I'm OK with not having a config option to disable this.

durin42 accepted this revision as: durin42.Jul 17 2019, 6:25 PM
valentin.gatienbaron added a commit: rHGb928b229a9e7: commit: improve the files field of changelog for merges.Jul 18 2019, 12:59 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb928b229a9e7: commit: improve the files field of changelog for merges (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15905

mercurial/localrepo.py

uipathfn(f)) uipathfn(f))
raise raise
# update manifest # update manifest
removed = [f for f in removed if f in m1 or f in m2] removed = [f for f in removed if f in m1 or f in m2]
drop = sorted([f for f in removed if f in m]) drop = sorted([f for f in removed if f in m])
for f in drop: for f in drop:
del m[f] del m[f]
if p2.rev() != nullrev:
JordiGHUnsubmitted
Done

Not all merges can be detected by checking for p2 being non-null; p1 being null but p2 being non-null is perfectly acceptable everywhere else, although normally hg won't produce commits like this in most circumstances.

JordiGH: Not all merges can be detected by checking for p2 being non-null; p1 being null but p2 being…
valentin.gatienbaronAuthorUnsubmitted
Done

It'd be trivial to change the code to check both parents, but I find what you say surprising. Aren't there plenty of places in hg that do checks similar to this one:

https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/context.py#l443
https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/context.py#l2414
https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/localrepo.py#l2407

valentin.gatienbaron: It'd be trivial to change the code to check both parents, but I find what you say surprising.
JordiGHUnsubmitted
Done

Hm, yes, you're right. I suppose it's a coincidence that a lot of things still work if p1 is null but p2 isn't. It's certainly not something that hg verify nor hg log complains about.

JordiGH: Hm, yes, you're right. I suppose it's a coincidence that a lot of things still work if p1 is…
@util.cachefunc
def mas():
p1n = p1.node()
p2n = p2.node()
cahs = self.changelog.commonancestorsheads(p1n, p2n)
if not cahs:
cahs = [nullrev]
return [self[r].manifest() for r in cahs]
def deletionfromparent(f):
# When a file is removed relative to p1 in a merge, this
# function determines whether the absence is due to a
# deletion from a parent, or whether the merge commit
# itself deletes the file. We decide this by doing a
# simplified three way merge of the manifest entry for
# the file. There are two ways we decide the merge
# itself didn't delete a file:
# - neither parent (nor the merge) contain the file
# - exactly one parent contains the file, and that
# parent has the same filelog entry as the merge
# ancestor (or all of them if there two). In other
# words, that parent left the file unchanged while the
# other one deleted it.
# One way to think about this is that deleting a file is
# similar to emptying it, so the list of changed files
# should be similar either way. The computation
# described above is not done directly in _filecommit
# when creating the list of changed files, however
# it does something very similar by comparing filelog
# nodes.
if f in m1:
return (f not in m2
and all(f in ma and ma.find(f) == m1.find(f)
for ma in mas()))
elif f in m2:
return all(f in ma and ma.find(f) == m2.find(f)
for ma in mas())
else:
return True
removed = [f for f in removed if not deletionfromparent(f)]
files = changed + removed files = changed + removed
md = None md = None
if not files: if not files:
# if no "files" actually changed in terms of the changelog, # if no "files" actually changed in terms of the changelog,
# try hard to detect unmodified manifest entry so that the # try hard to detect unmodified manifest entry so that the
# exact same commit can be reproduced later on convert. # exact same commit can be reproduced later on convert.
md = m1.diff(m, scmutil.matchfiles(self, ctx.files())) md = m1.diff(m, scmutil.matchfiles(self, ctx.files()))
if not files and md: if not files and md:

tests/test-backout.t

on branch2 with branch1 merged, so file1 should be gone: on branch2 with branch1 merged, so file1 should be gone:
$ hg merge $ hg merge
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -d '4 0' -m 'merge backout of branch1' $ hg ci -d '4 0' -m 'merge backout of branch1'
$ hg id $ hg id
22149cdde76d (branch2) tip d97a8500a969 (branch2) tip
$ hg st -A $ hg st -A
C default C default
C file2 C file2
$ hg summary $ hg summary
parent: 4:22149cdde76d tip parent: 4:d97a8500a969 tip
merge backout of branch1 merge backout of branch1
branch: branch2 branch: branch2
commit: (clean) commit: (clean)
update: (current) update: (current)
phases: 5 draft phases: 5 draft
on branch1, so no file1 and file2: on branch1, so no file1 and file2:

tests/test-commit-amend.t

$ hg ci -m aa $ hg ci -m aa
$ hg merge -q bar $ hg merge -q bar
warning: conflicts while merging cc! (edit, then use 'hg resolve --mark') warning: conflicts while merging cc! (edit, then use 'hg resolve --mark')
[1] [1]
$ hg resolve -m cc $ hg resolve -m cc
(no more unresolved files) (no more unresolved files)
$ hg ci -m 'merge bar' $ hg ci -m 'merge bar'
$ hg log --config diff.git=1 -pr . $ hg log --config diff.git=1 -pr .
changeset: 20:163cfd7219f7 changeset: 20:5aba7f3726e6
tag: tip tag: tip
parent: 19:30d96aeaf27b parent: 19:30d96aeaf27b
parent: 18:1aa437659d19 parent: 18:1aa437659d19
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: merge bar summary: merge bar
diff --git a/a b/aa diff --git a/a b/aa
aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
$ hg debugrename zz $ hg debugrename zz
zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
$ hg debugrename cc $ hg debugrename cc
cc not renamed cc not renamed
$ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit
HGEDITFORM=commit.amend.merge HGEDITFORM=commit.amend.merge
$ hg log --config diff.git=1 -pr . $ hg log --config diff.git=1 -pr .
changeset: 21:bca52d4ed186 changeset: 21:4b0631ef043e
tag: tip tag: tip
parent: 19:30d96aeaf27b parent: 19:30d96aeaf27b
parent: 18:1aa437659d19 parent: 18:1aa437659d19
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: merge bar (amend message) summary: merge bar (amend message)
diff --git a/a b/aa diff --git a/a b/aa
aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
$ hg debugrename zz $ hg debugrename zz
zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
$ hg debugrename cc $ hg debugrename cc
cc not renamed cc not renamed
$ hg mv zz z $ hg mv zz z
$ hg ci --amend -m 'merge bar (undo rename)' $ hg ci --amend -m 'merge bar (undo rename)'
$ hg log --config diff.git=1 -pr . $ hg log --config diff.git=1 -pr .
changeset: 22:12594a98ca3f changeset: 22:06423be42d60
tag: tip tag: tip
parent: 19:30d96aeaf27b parent: 19:30d96aeaf27b
parent: 18:1aa437659d19 parent: 18:1aa437659d19
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: merge bar (undo rename) summary: merge bar (undo rename)
diff --git a/a b/aa diff --git a/a b/aa
$ hg add x $ hg add x
$ hg ci -m x $ hg ci -m x
$ hg up -q default $ hg up -q default
$ hg merge -q bar $ hg merge -q bar
$ hg mv aa aaa $ hg mv aa aaa
$ echo aa >> aaa $ echo aa >> aaa
$ hg ci -m 'merge bar again' $ hg ci -m 'merge bar again'
$ hg log --config diff.git=1 -pr . $ hg log --config diff.git=1 -pr .
changeset: 24:dffde028b388 changeset: 24:a89974a20457
tag: tip tag: tip
parent: 22:12594a98ca3f parent: 22:06423be42d60
parent: 23:4c94d5bc65f5 parent: 23:4c94d5bc65f5
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: merge bar again summary: merge bar again
diff --git a/aa b/aa diff --git a/aa b/aa
deleted file mode 100644 deleted file mode 100644
--- a/aa --- a/aa
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ hg co -C tip $ hg co -C tip
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg mv aaa aa $ hg mv aaa aa
$ hg ci --amend -m 'merge bar again (undo rename)' $ hg ci --amend -m 'merge bar again (undo rename)'
$ hg log --config diff.git=1 -pr . $ hg log --config diff.git=1 -pr .
changeset: 25:18e3ba160489 changeset: 25:282080768800
tag: tip tag: tip
parent: 22:12594a98ca3f parent: 22:06423be42d60
parent: 23:4c94d5bc65f5 parent: 23:4c94d5bc65f5
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: merge bar again (undo rename) summary: merge bar again (undo rename)
diff --git a/aa b/aa diff --git a/aa b/aa
--- a/aa --- a/aa
+++ b/aa +++ b/aa
$ hg merge -q bar --config ui.interactive=True << EOF $ hg merge -q bar --config ui.interactive=True << EOF
> c > c
> EOF > EOF
file 'aa' was deleted in other [merge rev] but was modified in local [working copy]. file 'aa' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved. You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? c What do you want to do? c
$ hg ci -m 'merge bar (with conflicts)' $ hg ci -m 'merge bar (with conflicts)'
$ hg log --config diff.git=1 -pr . $ hg log --config diff.git=1 -pr .
changeset: 28:b4c3035e2544 changeset: 28:ed15db12298d
tag: tip tag: tip
parent: 27:4b216ca5ba97 parent: 27:eb5adec0b43b
parent: 26:67db8847a540 parent: 26:67db8847a540
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: merge bar (with conflicts) summary: merge bar (with conflicts)
$ hg rm aa $ hg rm aa
$ hg ci --amend -m 'merge bar (with conflicts, amended)' $ hg ci --amend -m 'merge bar (with conflicts, amended)'
$ hg log --config diff.git=1 -pr . $ hg log --config diff.git=1 -pr .
changeset: 29:1205ed810051 changeset: 29:0eeafd043f63
tag: tip tag: tip
parent: 27:4b216ca5ba97 parent: 27:eb5adec0b43b
parent: 26:67db8847a540 parent: 26:67db8847a540
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: merge bar (with conflicts, amended) summary: merge bar (with conflicts, amended)
diff --git a/aa b/aa diff --git a/aa b/aa
deleted file mode 100644 deleted file mode 100644
--- a/aa --- a/aa
R: R:
$ hg status -amr $ hg status -amr
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo" $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo"
expecting diff of foo expecting diff of foo
HG: M: HG: M:
HG: A: foo HG: A: foo
HG: R: HG: R:
HG: diff -r 1205ed810051 foo HG: diff -r 0eeafd043f63 foo
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +foo HG: +foo
$ echo y > y $ echo y > y
$ hg add y $ hg add y
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y" $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y"
expecting diff of foo and y expecting diff of foo and y
HG: M: HG: M:
HG: A: foo y HG: A: foo y
HG: R: HG: R:
HG: diff -r 1205ed810051 foo HG: diff -r 0eeafd043f63 foo
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +foo HG: +foo
HG: diff -r 1205ed810051 y HG: diff -r 0eeafd043f63 y
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +y HG: +y
$ hg rm a $ hg rm a
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y" $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y"
expecting diff of a, foo and y expecting diff of a, foo and y
HG: M: HG: M:
HG: A: foo y HG: A: foo y
HG: R: a HG: R: a
HG: diff -r 1205ed810051 a HG: diff -r 0eeafd043f63 a
HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: --- a/a Thu Jan 01 00:00:00 1970 +0000
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: @@ -1,2 +0,0 @@ HG: @@ -1,2 +0,0 @@
HG: -a HG: -a
HG: -a HG: -a
HG: diff -r 1205ed810051 foo HG: diff -r 0eeafd043f63 foo
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +foo HG: +foo
HG: diff -r 1205ed810051 y HG: diff -r 0eeafd043f63 y
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +y HG: +y
$ hg rm x $ hg rm x
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y" $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y"
expecting diff of a, foo, x and y expecting diff of a, foo, x and y
HG: M: HG: M:
HG: A: foo y HG: A: foo y
HG: R: a x HG: R: a x
HG: diff -r 1205ed810051 a HG: diff -r 0eeafd043f63 a
HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: --- a/a Thu Jan 01 00:00:00 1970 +0000
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: @@ -1,2 +0,0 @@ HG: @@ -1,2 +0,0 @@
HG: -a HG: -a
HG: -a HG: -a
HG: diff -r 1205ed810051 foo HG: diff -r 0eeafd043f63 foo
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +foo HG: +foo
HG: diff -r 1205ed810051 x HG: diff -r 0eeafd043f63 x
HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 HG: --- a/x Thu Jan 01 00:00:00 1970 +0000
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: @@ -1,1 +0,0 @@ HG: @@ -1,1 +0,0 @@
HG: -x HG: -x
HG: diff -r 1205ed810051 y HG: diff -r 0eeafd043f63 y
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +y HG: +y
$ echo cccc >> cc $ echo cccc >> cc
$ hg status -amr $ hg status -amr
M cc M cc
$ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc $ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc
cc should be excluded cc should be excluded
HG: M: HG: M:
HG: A: foo y HG: A: foo y
HG: R: a x HG: R: a x
HG: diff -r 1205ed810051 a HG: diff -r 0eeafd043f63 a
HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: --- a/a Thu Jan 01 00:00:00 1970 +0000
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: @@ -1,2 +0,0 @@ HG: @@ -1,2 +0,0 @@
HG: -a HG: -a
HG: -a HG: -a
HG: diff -r 1205ed810051 foo HG: diff -r 0eeafd043f63 foo
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +foo HG: +foo
HG: diff -r 1205ed810051 x HG: diff -r 0eeafd043f63 x
HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 HG: --- a/x Thu Jan 01 00:00:00 1970 +0000
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: @@ -1,1 +0,0 @@ HG: @@ -1,1 +0,0 @@
HG: -x HG: -x
HG: diff -r 1205ed810051 y HG: diff -r 0eeafd043f63 y
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +y HG: +y
Check for issue4405 Check for issue4405
------------------- -------------------

tests/test-convert-filemap.t

converting... converting...
1 add b 1 add b
0 merge a & b 0 merge a & b
$ hg -R merge-test2 manifest -r tip $ hg -R merge-test2 manifest -r tip
converted/a converted/a
converted/b converted/b
x x
$ hg -R merge-test2 log -G -T '{shortest(node)} {desc}\n{files % "- {file}\n"}\n' $ hg -R merge-test2 log -G -T '{shortest(node)} {desc}\n{files % "- {file}\n"}\n'
o 6eaa merge a & b o e2ff merge a & b
|\ - converted/a |\ - converted/a
| | - toberemoved
| | | |
| o 2995 add b | o 2995 add b
| | - converted/b | | - converted/b
| | | |
@ | 150e add x & remove tobremoved @ | 150e add x & remove tobremoved
|/ - toberemoved |/ - toberemoved
| - x | - x
| |

tests/test-convert-hg-startrev.t

3 2: copy e from a, change b 3 2: copy e from a, change b
2 3: change a 2 3: change a
1 4: merge 2 and 3 1 4: merge 2 and 3
0 5: change a 0 5: change a
$ glog full $ glog full
o 5 "5: change a" files: a o 5 "5: change a" files: a
| |
o 4 "4: merge 2 and 3" files: e f o 4 "4: merge 2 and 3" files: e
|\ |\
| o 3 "3: change a" files: a | o 3 "3: change a" files: a
| | | |
o | 2 "2: copy e from a, change b" files: b e o | 2 "2: copy e from a, change b" files: b e
| | | |
o | 1 "1: add c, move f to d" files: c d f o | 1 "1: add c, move f to d" files: c d f
|/ |/
o 0 "0: add a b f" files: a b f o 0 "0: add a b f" files: a b f
3 2: copy e from a, change b 3 2: copy e from a, change b
2 3: change a 2 3: change a
1 4: merge 2 and 3 1 4: merge 2 and 3
0 5: change a 0 5: change a
$ glog full $ glog full
o 5 "5: change a" files: a o 5 "5: change a" files: a
| |
o 4 "4: merge 2 and 3" files: e f o 4 "4: merge 2 and 3" files: e
|\ |\
| o 3 "3: change a" files: a | o 3 "3: change a" files: a
| | | |
o | 2 "2: copy e from a, change b" files: b e o | 2 "2: copy e from a, change b" files: b e
| | | |
o | 1 "1: add c, move f to d" files: c d f o | 1 "1: add c, move f to d" files: c d f
|/ |/
o 0 "0: add a b f" files: a b f o 0 "0: add a b f" files: a b f
A e A e
a a
$ hg st -C --change 0 a $ hg st -C --change 0 a
A a A a
(It seems like a bug in log that the following doesn't show rev 1.) (It seems like a bug in log that the following doesn't show rev 1.)
$ hg log --follow --copies e $ hg log --follow --copies e
changeset: 2:82bbac3d2cf4 changeset: 2:8d3c3fe67bb7
user: test user: test
date: Thu Jan 01 00:00:04 1970 +0000 date: Thu Jan 01 00:00:04 1970 +0000
summary: 4: merge 2 and 3 summary: 4: merge 2 and 3
changeset: 0:23c3be426dce changeset: 0:23c3be426dce
user: test user: test
date: Thu Jan 01 00:00:01 1970 +0000 date: Thu Jan 01 00:00:01 1970 +0000
summary: 1: add c, move f to d summary: 1: add c, move f to d

tests/test-copies.t

$ echo z > z $ echo z > z
$ hg ci -Aqm 'add z' $ hg ci -Aqm 'add z'
$ hg merge -q 1 $ hg merge -q 1
$ hg debugp1copies $ hg debugp1copies
$ hg debugp2copies $ hg debugp2copies
$ hg ci -m 'merge rename from p2' $ hg ci -m 'merge rename from p2'
$ hg l $ hg l
@ 3 merge rename from p2 @ 3 merge rename from p2
|\ x |\
| o 2 add z | o 2 add z
| | z | | z
o | 1 rename x to y o | 1 rename x to y
|/ x y |/ x y
o 0 add x o 0 add x
x x
Perhaps we should indicate the rename here, but `hg status` is documented to be weird during Perhaps we should indicate the rename here, but `hg status` is documented to be weird during
merges, so... merges, so...
warning: conflicts while merging z! (edit, then use 'hg resolve --mark') warning: conflicts while merging z! (edit, then use 'hg resolve --mark')
[1] [1]
$ echo z > z $ echo z > z
$ hg resolve -qm z $ hg resolve -qm z
$ hg ci -m 'merge 3 into 1' $ hg ci -m 'merge 3 into 1'
created new head created new head
$ hg l $ hg l
@ 5 merge 3 into 1 @ 5 merge 3 into 1
|\ y z |\ z
+---o 4 merge 1 into 3 +---o 4 merge 1 into 3
| |/ x z | |/ z
| o 3 modify z | o 3 modify z
| | z | | z
| o 2 rename y to z | o 2 rename y to z
| | y z | | y z
o | 1 rename x to z o | 1 rename x to z
|/ x z |/ x z
o 0 add x and y o 0 add x and y
x y x y

tests/test-glog-beautifygraph.t

summary: add a summary: add a
a | 1 + a | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ hg up -q 6 $ hg up -q 6
$ hg log -G --git --patch --follow-first e $ hg log -G --git --patch --follow-first e
\xe2\x97\x8d changeset: 6:fc281d8ff18d (esc) \xe2\x97\x8d changeset: 6:9feeac35a70a (esc)
\xe2\x94\x82\xe2\x95\xb2 tag: tip (esc) \xe2\x94\x82\xe2\x95\xb2 tag: tip (esc)
\xe2\x94\x82 \xe2\x95\xa7 parent: 5:99b31f1c2782 (esc) \xe2\x94\x82 \xe2\x95\xa7 parent: 5:99b31f1c2782 (esc)
\xe2\x94\x82 parent: 4:17d952250a9d (esc) \xe2\x94\x82 parent: 4:17d952250a9d (esc)
\xe2\x94\x82 user: test (esc) \xe2\x94\x82 user: test (esc)
\xe2\x94\x82 date: Thu Jan 01 00:00:00 1970 +0000 (esc) \xe2\x94\x82 date: Thu Jan 01 00:00:00 1970 +0000 (esc)
\xe2\x94\x82 summary: merge 5 and 4 (esc) \xe2\x94\x82 summary: merge 5 and 4 (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x94\x82 diff --git a/e b/e (esc) \xe2\x94\x82 diff --git a/e b/e (esc)
$ hg up -q 6 $ hg up -q 6
$ echo g > g $ echo g > g
$ hg ci -Am 'add g' g $ hg ci -Am 'add g' g
created new head created new head
$ hg up -q 2 $ hg up -q 2
$ hg log -G --template "{rev} {desc|firstline}\n" $ hg log -G --template "{rev} {desc|firstline}\n"
\xe2\x97\x8b 8 add g (esc) \xe2\x97\x8b 8 add g (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x94\x82 \xe2\x97\x8b 7 Added tag foo-bar for changeset fc281d8ff18d (esc) \xe2\x94\x82 \xe2\x97\x8b 7 Added tag foo-bar for changeset 9feeac35a70a (esc)
\xe2\x94\x82\xe2\x95\xb1 (esc) \xe2\x94\x82\xe2\x95\xb1 (esc)
\xe2\x97\x8b 6 merge 5 and 4 (esc) \xe2\x97\x8b 6 merge 5 and 4 (esc)
\xe2\x94\x82\xe2\x95\xb2 (esc) \xe2\x94\x82\xe2\x95\xb2 (esc)
\xe2\x94\x82 \xe2\x97\x8b 5 add another e (esc) \xe2\x94\x82 \xe2\x97\x8b 5 add another e (esc)
\xe2\x94\x82 \xe2\x94\x82 (esc) \xe2\x94\x82 \xe2\x94\x82 (esc)
\xe2\x97\x8b \xe2\x94\x82 4 mv dir/b e (esc) \xe2\x97\x8b \xe2\x94\x82 4 mv dir/b e (esc)
\xe2\x94\x82\xe2\x95\xb1 (esc) \xe2\x94\x82\xe2\x95\xb1 (esc)
\xe2\x97\x8b 3 mv a b; add d (esc) \xe2\x97\x8b 3 mv a b; add d (esc)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/e Thu Jan 01 00:00:00 1970 +0000 +++ b/e Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+ee +ee
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73 # Node ID 9feeac35a70aa325519bbf3178683271113f2b8f
# Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b
# Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260 # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260
merge 5 and 4 merge 5 and 4
diff -r 99b31f1c2782 -r fc281d8ff18d dir/b diff -r 99b31f1c2782 -r 9feeac35a70a dir/b
--- a/dir/b Thu Jan 01 00:00:00 1970 +0000 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@ @@ -1,1 +0,0 @@
-a -a
diff -r 99b31f1c2782 -r fc281d8ff18d e diff -r 99b31f1c2782 -r 9feeac35a70a e
--- a/e Thu Jan 01 00:00:00 1970 +0000 --- a/e Thu Jan 01 00:00:00 1970 +0000
+++ b/e Thu Jan 01 00:00:00 1970 +0000 +++ b/e Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-ee -ee
+merge +merge
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd # Node ID 9febbb9c8b2e09670a2fb550cb1e4e01a2c7e9fd
# Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 # Parent 9feeac35a70aa325519bbf3178683271113f2b8f
Added tag foo-bar for changeset fc281d8ff18d Added tag foo-bar for changeset 9feeac35a70a
diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags diff -r 9feeac35a70a -r 9febbb9c8b2e .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar +9feeac35a70aa325519bbf3178683271113f2b8f foo-bar
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449 # Node ID 3bd4551ec3fe1c0696241f236abe857a53c6d6e7
# Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 # Parent 9feeac35a70aa325519bbf3178683271113f2b8f
add g add g
diff -r fc281d8ff18d -r 24c2e826ddeb g diff -r 9feeac35a70a -r 3bd4551ec3fe g
--- a/g Thu Jan 01 00:00:00 1970 +0000 --- a/g Thu Jan 01 00:00:00 1970 +0000
+++ b/g Thu Jan 01 00:00:00 1970 +0000 +++ b/g Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,1 @@ @@ -1,2 +1,1 @@
-f -f
-f -f
+g +g
$ testlog --follow -r6 -r8 -r5 -r7 -r4 $ testlog --follow -r6 -r8 -r5 -r7 -r4
['6', '8', '5', '7', '4'] ['6', '8', '5', '7', '4']
[] []
[] []
<spanset- 0:9> <spanset- 0:9>
$ testlog --hidden $ testlog --hidden
[] []
[] []
<spanset- 0:9> <spanset- 0:9>
$ hg log -G --template '{rev} {desc}\n' $ hg log -G --template '{rev} {desc}\n'
\xe2\x97\x8b 7 Added tag foo-bar for changeset fc281d8ff18d (esc) \xe2\x97\x8b 7 Added tag foo-bar for changeset 9feeac35a70a (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x97\x8b 6 merge 5 and 4 (esc) \xe2\x97\x8b 6 merge 5 and 4 (esc)
\xe2\x94\x82\xe2\x95\xb2 (esc) \xe2\x94\x82\xe2\x95\xb2 (esc)
\xe2\x94\x82 \xe2\x97\x8b 5 add another e (esc) \xe2\x94\x82 \xe2\x97\x8b 5 add another e (esc)
\xe2\x94\x82 \xe2\x94\x82 (esc) \xe2\x94\x82 \xe2\x94\x82 (esc)
\xe2\x97\x8b \xe2\x94\x82 4 mv dir/b e (esc) \xe2\x97\x8b \xe2\x94\x82 4 mv dir/b e (esc)
\xe2\x94\x82\xe2\x95\xb1 (esc) \xe2\x94\x82\xe2\x95\xb1 (esc)
\xe2\x97\x8d 3 mv a b; add d (esc) \xe2\x97\x8d 3 mv a b; add d (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x97\x8d 3:5918b8d165d1 (esc) \xe2\x97\x8d 3:5918b8d165d1 (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x95\xa7 (esc) \xe2\x95\xa7 (esc)
node template with changesetprinter: node template with changesetprinter:
$ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"' $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"'
7 7:02dbb8e276b8 7 7:9febbb9c8b2e
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
6 6:fc281d8ff18d 6 6:9feeac35a70a
\xe2\x94\x82\xe2\x95\xb2 (esc) \xe2\x94\x82\xe2\x95\xb2 (esc)
\xe2\x94\x82 \xe2\x95\xa7 (esc) \xe2\x94\x82 \xe2\x95\xa7 (esc)
5 5:99b31f1c2782 5 5:99b31f1c2782
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x95\xa7 (esc) \xe2\x95\xa7 (esc)
node template with changesettemplater (shared cache variable): node template with changesettemplater (shared cache variable):
$ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \ $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \
> --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}' > --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}'
\xe2\x97\x8b 7 foo-bar+1 (esc) \xe2\x97\x8b 7 foo-bar+1 (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
# 6 foo-bar+0 # 6 foo-bar+0
\xe2\x94\x82\xe2\x95\xb2 (esc) \xe2\x94\x82\xe2\x95\xb2 (esc)
\xe2\x94\x82 \xe2\x95\xa7 (esc) \xe2\x94\x82 \xe2\x95\xa7 (esc)
\xe2\x97\x8b 5 null+5 (esc) \xe2\x97\x8b 5 null+5 (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x95\xa7 (esc) \xe2\x95\xa7 (esc)
label() should just work in node template: label() should just work in node template:
$ hg log -Gqr 7 --config extensions.color= --color=debug \ $ hg log -Gqr 7 --config extensions.color= --color=debug \
> --config ui.graphnodetemplate='{label("branch.{branch}", rev)}' > --config ui.graphnodetemplate='{label("branch.{branch}", rev)}'
[branch.default\xe2\x94\x827] [log.node|7:02dbb8e276b8] (esc) [branch.default\xe2\x94\x827] [log.node|7:9febbb9c8b2e] (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x95\xa7 (esc) \xe2\x95\xa7 (esc)
$ cd .. $ cd ..
change graph edge styling change graph edge styling
$ cd repo $ cd repo

tests/test-glog.t

summary: add a summary: add a
a | 1 + a | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ hg up -q 6 $ hg up -q 6
$ hg log -G --git --patch --follow-first e $ hg log -G --git --patch --follow-first e
@ changeset: 6:fc281d8ff18d @ changeset: 6:9feeac35a70a
|\ tag: tip |\ tag: tip
| ~ parent: 5:99b31f1c2782 | ~ parent: 5:99b31f1c2782
| parent: 4:17d952250a9d | parent: 4:17d952250a9d
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: merge 5 and 4 | summary: merge 5 and 4
| |
| diff --git a/e b/e | diff --git a/e b/e
$ hg up -q 6 $ hg up -q 6
$ echo g > g $ echo g > g
$ hg ci -Am 'add g' g $ hg ci -Am 'add g' g
created new head created new head
$ hg up -q 2 $ hg up -q 2
$ hg log -G --template "{rev} {desc|firstline}\n" $ hg log -G --template "{rev} {desc|firstline}\n"
o 8 add g o 8 add g
| |
| o 7 Added tag foo-bar for changeset fc281d8ff18d | o 7 Added tag foo-bar for changeset 9feeac35a70a
|/ |/
o 6 merge 5 and 4 o 6 merge 5 and 4
|\ |\
| o 5 add another e | o 5 add another e
| | | |
o | 4 mv dir/b e o | 4 mv dir/b e
|/ |/
o 3 mv a b; add d o 3 mv a b; add d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/e Thu Jan 01 00:00:00 1970 +0000 +++ b/e Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+ee +ee
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73 # Node ID 9feeac35a70aa325519bbf3178683271113f2b8f
# Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b
# Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260 # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260
merge 5 and 4 merge 5 and 4
diff -r 99b31f1c2782 -r fc281d8ff18d dir/b diff -r 99b31f1c2782 -r 9feeac35a70a dir/b
--- a/dir/b Thu Jan 01 00:00:00 1970 +0000 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@ @@ -1,1 +0,0 @@
-a -a
diff -r 99b31f1c2782 -r fc281d8ff18d e diff -r 99b31f1c2782 -r 9feeac35a70a e
--- a/e Thu Jan 01 00:00:00 1970 +0000 --- a/e Thu Jan 01 00:00:00 1970 +0000
+++ b/e Thu Jan 01 00:00:00 1970 +0000 +++ b/e Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-ee -ee
+merge +merge
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd # Node ID 9febbb9c8b2e09670a2fb550cb1e4e01a2c7e9fd
# Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 # Parent 9feeac35a70aa325519bbf3178683271113f2b8f
Added tag foo-bar for changeset fc281d8ff18d Added tag foo-bar for changeset 9feeac35a70a
diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags diff -r 9feeac35a70a -r 9febbb9c8b2e .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar +9feeac35a70aa325519bbf3178683271113f2b8f foo-bar
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449 # Node ID 3bd4551ec3fe1c0696241f236abe857a53c6d6e7
# Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 # Parent 9feeac35a70aa325519bbf3178683271113f2b8f
add g add g
diff -r fc281d8ff18d -r 24c2e826ddeb g diff -r 9feeac35a70a -r 3bd4551ec3fe g
--- a/g Thu Jan 01 00:00:00 1970 +0000 --- a/g Thu Jan 01 00:00:00 1970 +0000
+++ b/g Thu Jan 01 00:00:00 1970 +0000 +++ b/g Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,1 @@ @@ -1,2 +1,1 @@
-f -f
-f -f
+g +g
$ testlog --follow -r6 -r8 -r5 -r7 -r4 $ testlog --follow -r6 -r8 -r5 -r7 -r4
['6', '8', '5', '7', '4'] ['6', '8', '5', '7', '4']
[] []
[] []
<spanset- 0:9> <spanset- 0:9>
$ testlog --hidden $ testlog --hidden
[] []
[] []
<spanset- 0:9> <spanset- 0:9>
$ hg log -G --template '{rev} {desc}\n' $ hg log -G --template '{rev} {desc}\n'
o 7 Added tag foo-bar for changeset fc281d8ff18d o 7 Added tag foo-bar for changeset 9feeac35a70a
| |
o 6 merge 5 and 4 o 6 merge 5 and 4
|\ |\
| o 5 add another e | o 5 add another e
| | | |
o | 4 mv dir/b e o | 4 mv dir/b e
|/ |/
@ 3 mv a b; add d @ 3 mv a b; add d
| |
@ 3:5918b8d165d1 @ 3:5918b8d165d1
| |
~ ~
node template with changesetprinter: node template with changesetprinter:
$ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"' $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"'
7 7:02dbb8e276b8 7 7:9febbb9c8b2e
| |
6 6:fc281d8ff18d 6 6:9feeac35a70a
|\ |\
| ~ | ~
5 5:99b31f1c2782 5 5:99b31f1c2782
| |
~ ~
node template with changesettemplater (shared cache variable): node template with changesettemplater (shared cache variable):
$ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \ $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \
> --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}' > --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}'
o 7 foo-bar+1 o 7 foo-bar+1
| |
# 6 foo-bar+0 # 6 foo-bar+0
|\ |\
| ~ | ~
o 5 null+5 o 5 null+5
| |
~ ~
label() should just work in node template: label() should just work in node template:
$ hg log -Gqr 7 --config extensions.color= --color=debug \ $ hg log -Gqr 7 --config extensions.color= --color=debug \
> --config ui.graphnodetemplate='{label("branch.{branch}", rev)}' > --config ui.graphnodetemplate='{label("branch.{branch}", rev)}'
[branch.default|7] [log.node|7:02dbb8e276b8] [branch.default|7] [log.node|7:9febbb9c8b2e]
| |
~ ~
$ cd .. $ cd ..
change graph edge styling change graph edge styling
$ cd repo $ cd repo

tests/test-issue672.t

$ hg merge -y --debug 4 $ hg merge -y --debug 4
unmatched files in local: unmatched files in local:
1a 1a
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: '1' -> dst: '1a' * src: '1' -> dst: '1a' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
preserving 1a for resolve of 1a preserving 1a for resolve of 1a
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
1a: local copied/moved from 1 -> m (premerge) 1a: local copied/moved from 1 -> m (premerge)
picked tool ':merge' for 1a (binary False symlink False changedelete False) picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1a and 1 to 1a merging 1a and 1 to 1a
my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9 my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9
premerge successful premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg co -C 4 $ hg co -C 4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge -y --debug 3 $ hg merge -y --debug 3
unmatched files in other: unmatched files in other:
1a 1a
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: '1' -> dst: '1a' * src: '1' -> dst: '1a' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b
preserving 1 for resolve of 1a preserving 1 for resolve of 1a
removing 1 removing 1
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
1a: remote moved from 1 -> m (premerge) 1a: remote moved from 1 -> m (premerge)
picked tool ':merge' for 1a (binary False symlink False changedelete False) picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1 and 1a to 1a merging 1 and 1a to 1a
my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9 my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9
premerge successful premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)

tests/test-lfconvert.t

$ cd .. $ cd ..
lfconvert with rename, merge, and remove lfconvert with rename, merge, and remove
$ rm -rf largefiles-repo $ rm -rf largefiles-repo
$ hg lfconvert --size 0.2 bigfile-repo largefiles-repo $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
initializing destination largefiles-repo initializing destination largefiles-repo
$ cd largefiles-repo $ cd largefiles-repo
$ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
o 5:8e05f5f2b77e merge o 5:9cc5aa7204f0 merge
|\ |\
| o 4:a5a02de7a8e4 remove large, normal3 | o 4:a5a02de7a8e4 remove large, normal3
| | | |
| o 3:55759520c76f add normal3, modify sub/* | o 3:55759520c76f add normal3, modify sub/*
| | | |
o | 2:261ad3f3f037 rename sub/ to stuff/ o | 2:261ad3f3f037 rename sub/ to stuff/
|/ |/
o 1:334e5237836d add sub/* o 1:334e5237836d add sub/*
converting... converting...
7 add large, normal1 7 add large, normal1
6 add sub/* 6 add sub/*
5 rename sub/ to stuff/ 5 rename sub/ to stuff/
4 add normal3, modify sub/* 4 add normal3, modify sub/*
3 remove large, normal3 3 remove large, normal3
2 merge 2 merge
1 add anotherlarge (should be a largefile) 1 add anotherlarge (should be a largefile)
0 Added tag mytag for changeset abacddda7028 0 Added tag mytag for changeset 17126745edfd
$ cd ../normal-repo $ cd ../normal-repo
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> largefiles = ! > largefiles = !
> EOF > EOF
$ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
o 7:b5fedc110b9d Added tag mytag for changeset 867ab992ecf4 o 7:b5fedc110b9d Added tag mytag for changeset 867ab992ecf4
converting... converting...
7 add large, normal1 7 add large, normal1
6 add sub/* 6 add sub/*
5 rename sub/ to stuff/ 5 rename sub/ to stuff/
4 add normal3, modify sub/* 4 add normal3, modify sub/*
3 remove large, normal3 3 remove large, normal3
2 merge 2 merge
1 add anotherlarge (should be a largefile) 1 add anotherlarge (should be a largefile)
0 Added tag mytag for changeset abacddda7028 0 Added tag mytag for changeset 17126745edfd
$ hg -R largefiles-repo-hg log -G --template "{rev}:{node|short} {desc|firstline}\n" $ hg -R largefiles-repo-hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
o 7:2f08f66459b7 Added tag mytag for changeset 17126745edfd o 7:2f08f66459b7 Added tag mytag for changeset 17126745edfd
| |
o 6:17126745edfd add anotherlarge (should be a largefile) o 6:17126745edfd add anotherlarge (should be a largefile)
| |
o 5:9cc5aa7204f0 merge o 5:9cc5aa7204f0 merge
|\ |\
converting... converting...
8 add large, normal1 8 add large, normal1
7 add sub/* 7 add sub/*
6 rename sub/ to stuff/ 6 rename sub/ to stuff/
5 add normal3, modify sub/* 5 add normal3, modify sub/*
4 remove large, normal3 4 remove large, normal3
3 merge 3 merge
2 add anotherlarge (should be a largefile) 2 add anotherlarge (should be a largefile)
1 Added tag mytag for changeset abacddda7028 1 Added tag mytag for changeset 17126745edfd
0 change branch name only 0 change branch name only
Ensure empty commits aren't lost in the conversion Ensure empty commits aren't lost in the conversion
$ hg -R normalized3519 log -r tip -T '{desc}\n' $ hg -R normalized3519 log -r tip -T '{desc}\n'
change branch name only change branch name only
Ensure the abort message is useful if a largefile is entirely unavailable Ensure the abort message is useful if a largefile is entirely unavailable
$ rm -rf normalized3519 $ rm -rf normalized3519

tests/test-merge-combination.t

1234 C: agree on "a" 1234 C: agree on "a"
123- C: agree on "a" 123- C: agree on "a"
12-1 C: agree on "a" 12-1 C: agree on "a"
12-2 C: hg said "", expected "a" 12-2 C: hg said "", expected "a"
12-3 C: agree on "a" 12-3 C: agree on "a"
12-- C: agree on "a" 12-- C: agree on "a"
1-11 : hg said "", expected "a" 1-11 : hg said "", expected "a"
1-12 : agree on "a" 1-12 : agree on "a"
1-1- : hg said "a", expected "" 1-1- : agree on ""
1-21 C: agree on "a" 1-21 C: agree on "a"
1-22 C: hg said "", expected "a" 1-22 C: hg said "", expected "a"
1-23 C: agree on "a" 1-23 C: agree on "a"
1-2- C: agree on "a" 1-2- C: agree on "a"
1--1 : agree on "a" 1--1 : agree on "a"
1--2 : agree on "a" 1--2 : agree on "a"
1--- : agree on "" 1--- : agree on ""
-111 : agree on "" -111 : agree on ""
$ touch $files; hg commit -qAm '0 root' $ touch $files; hg commit -qAm '0 root'
$ for f in $files; do echo f > $f; done; hg commit -qAm '1 gca1' $ for f in $files; do echo f > $f; done; hg commit -qAm '1 gca1'
$ hg up -qr0; hg revert -qr 1 --all; hg commit -qAm '2 gca2' $ hg up -qr0; hg revert -qr 1 --all; hg commit -qAm '2 gca2'
$ hg up -qr 1; hg merge -qr 2; rm *1; hg commit -qAm '3 p1' $ hg up -qr 1; hg merge -qr 2; rm *1; hg commit -qAm '3 p1'
$ hg up -qr 2; hg merge -qr 1; rm *2; hg commit -qAm '4 p2' $ hg up -qr 2; hg merge -qr 1; rm *2; hg commit -qAm '4 p2'
$ hg merge -qr 3; echo f > u1; echo f > u2; rm -f c1 c2 $ hg merge -qr 3; echo f > u1; echo f > u2; rm -f c1 c2
$ hg commit -qAm '5 merge with two gcas' $ hg commit -qAm '5 merge with two gcas'
$ hg log -r . -T '{files}\n' # expecting u1 u2 $ hg log -r . -T '{files}\n' # expecting u1 u2
c1
$ cd ../ $ cd ../
$ rm -rf repo $ rm -rf repo

tests/test-rebase-inmemory.t

$ mv d e $ mv d e
$ hg addremove -qs 0 $ hg addremove -qs 0
$ hg ci -qm 'untracked rename of d to e' $ hg ci -qm 'untracked rename of d to e'
$ hg debugobsolete -q `hg log -T '{node}' -r 4` `hg log -T '{node}' -r .` $ hg debugobsolete -q `hg log -T '{node}' -r 4` `hg log -T '{node}' -r .`
1 new orphan changesets 1 new orphan changesets
$ hg tglog $ hg tglog
@ 6: 676538af172d 'untracked rename of d to e' @ 6: 676538af172d 'untracked rename of d to e'
| |
| * 5: 71cb43376053 'merge' | * 5: 574d92ad16fc 'merge'
| |\ | |\
| | x 4: 2c8b5dad7956 'rename d to e' | | x 4: 2c8b5dad7956 'rename d to e'
| | | | | |
| o | 3: ca58782ad1e4 'b' | o | 3: ca58782ad1e4 'b'
|/ / |/ /
o / 2: 814f6bd05178 'c' o / 2: 814f6bd05178 'c'
|/ |/
o 1: 02952614a83d 'd' o 1: 02952614a83d 'd'
| |
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ hg rebase -b 5 -d tip $ hg rebase -b 5 -d tip
rebasing 3:ca58782ad1e4 "b" rebasing 3:ca58782ad1e4 "b"
rebasing 5:71cb43376053 "merge" rebasing 5:574d92ad16fc "merge"
note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes note: not rebasing 5:574d92ad16fc "merge", its destination already has all its changes
$ cd .. $ cd ..
Test rebasing a commit with copy information Test rebasing a commit with copy information
$ hg init rebase-rename $ hg init rebase-rename
$ cd rebase-rename $ cd rebase-rename
$ echo a > a $ echo a > a

tests/test-rebase-newancestor.t

$ hg up -q default $ hg up -q default
$ echo stuff > f-other $ echo stuff > f-other
$ hg ci -Aqm 'default: f-other stuff' $ hg ci -Aqm 'default: f-other stuff'
$ hg tglog $ hg tglog
@ 7: e08089805d82 'default: f-other stuff' @ 7: e08089805d82 'default: f-other stuff'
| |
| o 6: 9455ee510502 'dev: merge default' dev | o 6: 010ced67e558 'dev: merge default' dev
|/| |/|
o | 5: 462860db70a1 'default: remove f-default' o | 5: 462860db70a1 'default: remove f-default'
| | | |
| o 4: 4b019212aaf6 'dev: merge default' dev | o 4: 4b019212aaf6 'dev: merge default' dev
|/| |/|
o | 3: f157ecfd2b6b 'default: f-default stuff' o | 3: f157ecfd2b6b 'default: f-default stuff'
| | | |
| o 2: ec2c14fb2984 'dev: f-dev stuff' dev | o 2: ec2c14fb2984 'dev: f-dev stuff' dev
> EOF > EOF
rebasing 1:1d1a643d390e "dev: create branch" rebasing 1:1d1a643d390e "dev: create branch"
note: not rebasing 1:1d1a643d390e "dev: create branch", its destination already has all its changes note: not rebasing 1:1d1a643d390e "dev: create branch", its destination already has all its changes
rebasing 2:ec2c14fb2984 "dev: f-dev stuff" rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default" rebasing 4:4b019212aaf6 "dev: merge default"
file 'f-default' was deleted in local [dest] but was modified in other [source]. file 'f-default' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? c What do you want to do? c
rebasing 6:9455ee510502 "dev: merge default" rebasing 6:010ced67e558 "dev: merge default"
saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-4a6f6d17-rebase.hg
$ hg tglog $ hg tglog
o 6: fbc098e72227 'dev: merge default' o 6: de147e4f69cf 'dev: merge default'
| |
o 5: eda7b7f46f5d 'dev: merge default' o 5: eda7b7f46f5d 'dev: merge default'
| |
o 4: 3e075b1c0a40 'dev: f-dev stuff' o 4: 3e075b1c0a40 'dev: f-dev stuff'
| |
@ 3: e08089805d82 'default: f-other stuff' @ 3: e08089805d82 'default: f-other stuff'
| |
o 2: 462860db70a1 'default: remove f-default' o 2: 462860db70a1 'default: remove f-default'
$ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF $ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF
> c > c
> EOF > EOF
rebasing 2:ec2c14fb2984 "dev: f-dev stuff" rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default" rebasing 4:4b019212aaf6 "dev: merge default"
file 'f-default' was deleted in local [dest] but was modified in other [source]. file 'f-default' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? c What do you want to do? c
rebasing 6:9455ee510502 "dev: merge default" rebasing 6:010ced67e558 "dev: merge default"
saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-827d7a44-rebase.hg
$ hg tglog $ hg tglog
o 7: fbc098e72227 'dev: merge default' o 7: de147e4f69cf 'dev: merge default'
| |
o 6: eda7b7f46f5d 'dev: merge default' o 6: eda7b7f46f5d 'dev: merge default'
| |
o 5: 3e075b1c0a40 'dev: f-dev stuff' o 5: 3e075b1c0a40 'dev: f-dev stuff'
| |
o 4: e08089805d82 'default: f-other stuff' o 4: e08089805d82 'default: f-other stuff'
| |
o 3: 462860db70a1 'default: remove f-default' o 3: 462860db70a1 'default: remove f-default'

tests/test-revset.t

1 1
4 4
$ log 'modifies(b)' $ log 'modifies(b)'
4 4
$ log 'modifies("path:b")' $ log 'modifies("path:b")'
4 4
$ log 'modifies("*")' $ log 'modifies("*")'
4 4
6
$ log 'modifies("set:modified()")' $ log 'modifies("set:modified()")'
4 4
$ log 'id(5)' $ log 'id(5)'
2
$ log 'only(9)' $ log 'only(9)'
8 8
9 9
$ log 'only(8)' $ log 'only(8)'
8 8
$ log 'only(9, 5)' $ log 'only(9, 5)'
2 2
4 4
9 9
$ log 'rev(10)' $ log 'rev(10)'
$ log 'rev(tip)' $ log 'rev(tip)'
hg: parse error: rev expects a number hg: parse error: rev expects a number
[255] [255]
Test hexadecimal revision Test hexadecimal revision
$ log 'id(2)' $ log 'id(2)'
$ log 'id(5)' $ log 'id(8)'
2 3
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'id(x5)' $ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'id(x8)'
2 3
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'x5' $ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'x8'
2 3
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'id(x)' $ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'id(x)'
$ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'x' $ hg --config experimental.revisions.prefixhexnode=yes log --template '{rev}\n' -r 'x'
abort: 00changelog.i@: ambiguous identifier! abort: 00changelog.i@: ambiguous identifier!
[255] [255]
$ log 'id(23268)' $ log 'id(23268)'
4 4
$ log 'id(2785f51eece)' $ log 'id(2785f51eece)'
0 0
0 0
2 2
$ log 'p2(branchpoint())' $ log 'p2(branchpoint())'
$ log 'parents(branchpoint())' $ log 'parents(branchpoint())'
0 0
2 2
$ log 'removes(a)' $ log 'removes(a)'
2 2
6
$ log 'roots(all())' $ log 'roots(all())'
0 0
$ log 'reverse(2 or 3 or 4 or 5)' $ log 'reverse(2 or 3 or 4 or 5)'
5 5
4 4
3 3
2 2
$ log 'reverse(all())' $ log 'reverse(all())'
8 8
9 9
test sorting two sorted collections in different orders test sorting two sorted collections in different orders
$ log 'sort(outgoing() or reverse(removes(a)), rev)' $ log 'sort(outgoing() or reverse(removes(a)), rev)'
2 2
6
8 8
9 9
test sorting two sorted collections in different orders backwards test sorting two sorted collections in different orders backwards
$ log 'sort(outgoing() or reverse(removes(a)), -rev)' $ log 'sort(outgoing() or reverse(removes(a)), -rev)'
9 9
8 8
6
2 2
test empty sort key which is noop test empty sort key which is noop
$ log 'sort(0 + 2 + 1, "")' $ log 'sort(0 + 2 + 1, "")'
0 0
2 2
1 1

tests/test-revset2.t

8 8
9 9
test intersecting something with an addset test intersecting something with an addset
$ log 'parents(outgoing() or removes(a))' $ log 'parents(outgoing() or removes(a))'
1 1
4 4
5
8 8
test that `or` operation combines elements in the right order: test that `or` operation combines elements in the right order:
$ log '3:4 or 2:5' $ log '3:4 or 2:5'
3 3
4 4
2 2
6 6
7 7
test usage in revpair (with "+") test usage in revpair (with "+")
(real pair) (real pair)
$ hg diff -r 'tip^^' -r 'tip' $ hg diff -r 'tip^^' -r 'tip'
diff -r 2326846efdab -r 24286f4ae135 .hgtags diff -r 2326846efdab -r d2e607fcf9e4 .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 +d5e6808a86077d6f5c1ff626d4352d01da7d2a1f 1.0
$ hg diff -r 'tip^^::tip' $ hg diff -r 'tip^^::tip'
diff -r 2326846efdab -r 24286f4ae135 .hgtags diff -r 2326846efdab -r d2e607fcf9e4 .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 +d5e6808a86077d6f5c1ff626d4352d01da7d2a1f 1.0
(single rev) (single rev)
$ hg diff -r 'tip^' -r 'tip^' $ hg diff -r 'tip^' -r 'tip^'
$ hg diff -r 'tip^:tip^' $ hg diff -r 'tip^:tip^'
(single rev that does not looks like a range) (single rev that does not looks like a range)
$ hg diff -r 'tip^::tip^ or tip^' $ hg diff -r 'tip^::tip^ or tip^'
diff -r d5d0dcbdc4d9 .hgtags diff -r d5d0dcbdc4d9 .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags * (glob) +++ b/.hgtags * (glob)
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 +d5e6808a86077d6f5c1ff626d4352d01da7d2a1f 1.0
$ hg diff -r 'tip^ or tip^' $ hg diff -r 'tip^ or tip^'
diff -r d5d0dcbdc4d9 .hgtags diff -r d5d0dcbdc4d9 .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags * (glob) +++ b/.hgtags * (glob)
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 +d5e6808a86077d6f5c1ff626d4352d01da7d2a1f 1.0
(no rev) (no rev)
$ hg diff -r 'author("babar") or author("celeste")' $ hg diff -r 'author("babar") or author("celeste")'
abort: empty revision range abort: empty revision range
[255] [255]
aliases: aliases:
(symbol 'date')))) (symbol 'date'))))
* set: * set:
<baseset [3, 2]> <baseset [3, 2]>
3 3
2 2
issue4553: check that revset aliases override existing hash prefix issue4553: check that revset aliases override existing hash prefix
$ hg log -qr e $ hg log -qr d5e
6:e0cc66ef77e8 6:d5e6808a8607
$ hg log -qr e --config revsetalias.e="all()" $ hg log -qr d5e --config revsetalias.d5e="all()"
0:2785f51eece5 0:2785f51eece5
1:d75937da8da0 1:d75937da8da0
2:5ed5505e9f1c 2:5ed5505e9f1c
3:8528aa5637f2 3:8528aa5637f2
4:2326846efdab 4:2326846efdab
5:904fa392b941 5:904fa392b941
6:e0cc66ef77e8 6:d5e6808a8607
7:013af1973af4 7:586353d483b3
8:d5d0dcbdc4d9 8:d5d0dcbdc4d9
9:24286f4ae135 9:d2e607fcf9e4
$ hg log -qr e: --config revsetalias.e="0" $ hg log -qr d5e: --config revsetalias.d5e="0"
0:2785f51eece5 0:2785f51eece5
1:d75937da8da0 1:d75937da8da0
2:5ed5505e9f1c 2:5ed5505e9f1c
3:8528aa5637f2 3:8528aa5637f2
4:2326846efdab 4:2326846efdab
5:904fa392b941 5:904fa392b941
6:e0cc66ef77e8 6:d5e6808a8607
7:013af1973af4 7:586353d483b3
8:d5d0dcbdc4d9 8:d5d0dcbdc4d9
9:24286f4ae135 9:d2e607fcf9e4
$ hg log -qr :e --config revsetalias.e="9" $ hg log -qr :d5e --config revsetalias.d5e="9"
0:2785f51eece5 0:2785f51eece5
1:d75937da8da0 1:d75937da8da0
2:5ed5505e9f1c 2:5ed5505e9f1c
3:8528aa5637f2 3:8528aa5637f2
4:2326846efdab 4:2326846efdab
5:904fa392b941 5:904fa392b941
6:e0cc66ef77e8 6:d5e6808a8607
7:013af1973af4 7:586353d483b3
8:d5d0dcbdc4d9 8:d5d0dcbdc4d9
9:24286f4ae135 9:d2e607fcf9e4
$ hg log -qr e: $ hg log -qr d5e:
6:e0cc66ef77e8 6:d5e6808a8607
7:013af1973af4 7:586353d483b3
8:d5d0dcbdc4d9 8:d5d0dcbdc4d9
9:24286f4ae135 9:d2e607fcf9e4
$ hg log -qr :e $ hg log -qr :d5e
0:2785f51eece5 0:2785f51eece5
1:d75937da8da0 1:d75937da8da0
2:5ed5505e9f1c 2:5ed5505e9f1c
3:8528aa5637f2 3:8528aa5637f2
4:2326846efdab 4:2326846efdab
5:904fa392b941 5:904fa392b941
6:e0cc66ef77e8 6:d5e6808a8607
issue2549 - correct optimizations issue2549 - correct optimizations
$ try 'limit(1 or 2 or 3, 2) and not 2' $ try 'limit(1 or 2 or 3, 2) and not 2'
(and (and
(func (func
(symbol 'limit') (symbol 'limit')
(list (list
$ echo 'cat2($1, $2) = $1 ## $2' >> .hg/hgrc $ echo 'cat2($1, $2) = $1 ## $2' >> .hg/hgrc
$ echo 'cat2x2($1, $2, $3, $4) = cat2($1 ## $2, $3 ## $4)' >> .hg/hgrc $ echo 'cat2x2($1, $2, $3, $4) = cat2($1 ## $2, $3 ## $4)' >> .hg/hgrc
$ log "cat2x2(278, '5f5', 1ee, 'ce5')" $ log "cat2x2(278, '5f5', 1ee, 'ce5')"
0 0
(check operator priority) (check operator priority)
$ echo 'cat2n2($1, $2, $3, $4) = $1 ## $2 or $3 ## $4~2' >> .hg/hgrc $ echo 'cat2n2($1, $2, $3, $4) = $1 ## $2 or $3 ## $4~2' >> .hg/hgrc
$ log "cat2n2(2785f5, 1eece5, 24286f, 4ae135)" $ log "cat2n2(2785f5, 1eece5, d2e607, fcf9e4)"
0 0
4 4
$ cd .. $ cd ..
prepare repository that has "default" branches of multiple roots prepare repository that has "default" branches of multiple roots
$ hg init namedbranch $ hg init namedbranch

tests/test-template-keywords.t

$ hg co '.^' -q $ hg co '.^' -q
$ touch c $ touch c
$ hg add c $ hg add c
$ hg ci -qm 'add file' $ hg ci -qm 'add file'
$ hg merge 10 -q $ hg merge 10 -q
$ hg ci -m 'merge' $ hg ci -m 'merge'
$ hg log -l1 -T '{files}\n' $ hg log -l1 -T '{files}\n'
a fourth
$ hg log -l1 -T '{file_mods}\n' $ hg log -l1 -T '{file_mods}\n'
$ hg log -l1 -T '{file_adds}\n' $ hg log -l1 -T '{file_adds}\n'
$ hg log -l1 -T '{file_dels}\n' $ hg log -l1 -T '{file_dels}\n'
a fourth
Test file copies dict: Test file copies dict:
$ hg log -r8 -T '{join(file_copies, " ")}\n' $ hg log -r8 -T '{join(file_copies, " ")}\n'
fourth (second) fourth (second)
$ hg log -r8 -T '{file_copies % "{name} <- {source}\n"}' $ hg log -r8 -T '{file_copies % "{name} <- {source}\n"}'
fourth <- second fourth <- second
$ hg log -r8 -T '{file_copies % "{path} <- {source}\n"}' $ hg log -r8 -T '{file_copies % "{path} <- {source}\n"}'