facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-12-27 15:13:37 +03:00
Code Issues Projects Releases Wiki Activity
c7d12b648f
sapling/eden/scm/tests/test-rebase-bookmarks.t

238 lines
4.8 KiB
Perl
Raw Normal View History

tests: enable chg for 572 tests Summary: Add `#chg-compatible` to 572 tests that seem to pass with chg enabled. This should make them run faster. Reviewed By: xavierd Differential Revision: D18870507 fbshipit-source-id: fe895e733efffc9286cd3d17c7a156c803124395
2019-12-10 02:24:31 +03:00
#chg-compatible
tests: use disable treemanifest in place of setconfig Summary: Use `disable treemanifest` in place of `setconfig extensions.treemanifest=!` Reviewed By: quark-zju Differential Revision: D19457678 fbshipit-source-id: 47c8b3c4f4ed5cfc97275ca67afab4a86ffe7f0d
2020-01-20 13:42:49 +03:00
$ disable treemanifest
tests: update tests-[r-x]*.t to use new tinit features Reviewed By: quark-zju Differential Revision: D19457676 fbshipit-source-id: 5bbab22ff0d98b725b63b906864037fae5fa5171
2020-01-20 13:42:49 +03:00
TODO: configure mutation
$ configure noevolution
$ enable rebase
$ setconfig phases.publish=false
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
Create a repo with several bookmarks
$ hg init a
$ cd a
$ echo a > a
$ hg ci -Am A
adding a
$ echo b > b
$ hg ci -Am B
adding b
$ hg book 'X'
$ hg book 'Y'
check-code: fix check for trailing whitespace on empty lines It seems like the intention with c4ecbbd282fe was to catch lines with only one whitespace too.
2012-08-08 20:10:30 +04:00
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
$ echo c > c
$ hg ci -Am C
adding c
$ hg book 'Z'
$ hg up -q 0
$ echo d > d
$ hg ci -Am D
adding d
bookmarks: correctly update current bookmarks on rebase (issue2277) When you rebased with a currently active bookmark, that bookmark would always point at the new tip, regardless of what revision it pointed at before the rebase. All bookmarks will now point at the equivalent post-rebase commit. However, the currently active bookmark will cease to be active unless it points at the new tip post-rebase. Rebase will always leave the new tip as the working copy parent, which is incompatible with having an active bookmark that points at some other revision. The common case should be that the active bookmark will point at the new tip post-rebase.
2012-06-22 22:40:31 +04:00
$ hg book W
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
$ tglog
@ 3: 41acb9dca9eb 'D' W
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
| o 2: 49cb3485fa0c 'C' Y Z
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
| |
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
| o 1: 6c81ed0049f8 'B' X
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
|/
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 0: 1994f17a630e 'A'
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
check-code: fix check for trailing whitespace on empty lines It seems like the intention with c4ecbbd282fe was to catch lines with only one whitespace too.
2012-08-08 20:10:30 +04:00
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
Move only rebased bookmarks
$ cd ..
$ hg clone -q a a1
$ cd a1
$ hg up -q Z
rebase: delete divergent bookmarks on destination (issue3685) Similar to merge, divergent bookmarks are only deleted when the bookmark is on the destination parent.
2013-01-31 04:08:32 +04:00
Test deleting divergent bookmarks from dest (issue3685)
$ hg book -r 3 Z@diverge
... and also test that bookmarks not on dest or not being moved aren't deleted
$ hg book -r 3 X@diverge
$ hg book -r 0 Y@diverge
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
$ tglog
o 3: 41acb9dca9eb 'D' W X@diverge Z@diverge
rebase: delete divergent bookmarks on destination (issue3685) Similar to merge, divergent bookmarks are only deleted when the bookmark is on the destination parent.
2013-01-31 04:08:32 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
| @ 2: 49cb3485fa0c 'C' Y Z
rebase: delete divergent bookmarks on destination (issue3685) Similar to merge, divergent bookmarks are only deleted when the bookmark is on the destination parent.
2013-01-31 04:08:32 +04:00
| |
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
| o 1: 6c81ed0049f8 'B' X
rebase: delete divergent bookmarks on destination (issue3685) Similar to merge, divergent bookmarks are only deleted when the bookmark is on the destination parent.
2013-01-31 04:08:32 +04:00
|/
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 0: 1994f17a630e 'A' Y@diverge
rebase: delete divergent bookmarks on destination (issue3685) Similar to merge, divergent bookmarks are only deleted when the bookmark is on the destination parent.
2013-01-31 04:08:32 +04:00
rebase: do not add second parent to rebased changeset (drop detach option) (BC) Rebase now behaves as if --detach was always passed. Non-merges are rebased as non-merges, regardless of their parent being an ancestor of the destination. Merges will usually be rebased as merges unless both of their parents are ancestors of the destination, or one of their parents is pruned when rebased. This only alters the behavior of rebase when using the --source/--rev options. --detach option is deprecated. All test changes were carefully validated.
2012-06-20 22:08:57 +04:00
$ hg rebase -s Y -d 3
rebase: remove rev number from rebase output Summary: Revision numbers are deprecated, let's not print them in the rebase output. The tests were automatically fixed with run-tests.py -i Reviewed By: quark-zju Differential Revision: D17936451 fbshipit-source-id: a8f0403b6af4573421ca874e9311f26931eba697
2019-10-16 02:28:01 +03:00
rebasing 49cb3485fa0c "C" (Y Z)
tests: remove (glob) annotations that were only for '\' matches # skip-blame because this was mechanically rewritten the following script. I ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t ones appear to be, and they run without addition failures on both Windows and Linux. import argparse import os import re ap = argparse.ArgumentParser() ap.add_argument('path', nargs='+') opts = ap.parse_args() globre = re.compile(r'^(.*) \(glob\)(.*)$') for p in opts.path: tmp = p + '.tmp' with open(p, 'rb') as src, open(tmp, 'wb') as dst: for line in src: m = globre.match(line) if not m or '$LOCALIP' in line or '*' in line: dst.write(line) continue if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'): dst.write(line) continue dst.write(m.group(1) + m.group(2) + '\n') os.unlink(p) os.rename(tmp, p)
2017-12-11 06:50:57 +03:00
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
$ tglog
@ 3: 17fb3faba63c 'C' Y Z
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 2: 41acb9dca9eb 'D' W X@diverge
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
| o 1: 6c81ed0049f8 'B' X
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
|/
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 0: 1994f17a630e 'A' Y@diverge
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
rebase: do not try to reactivate deleted divergent bookmark If the currently active bookmark is divergent one, it may be resolved during rebase. Trying to activate it will raise "KeyError: 'W@diverge'".
2014-02-15 11:19:19 +04:00
Do not try to keep active but deleted divergent bookmark
$ cd ..
$ hg clone -q a a4
$ cd a4
$ hg up -q 2
$ hg book W@diverge
$ hg rebase -s W -d .
tags: remove tip tag Summary: In a future diff we'll be removing tags. The most prevalent tag is 'tip', which shows up in a ton of test output. Let's drop that tag first, so we can safely update the tests before we drop tags entirely. Reviewed By: xavierd Differential Revision: D18995058 fbshipit-source-id: 8c63710cd4ed567ea24e32724b8660f9006a61f1
2019-12-18 00:45:17 +03:00
rebasing 41acb9dca9eb "D" (W)
tests: remove (glob) annotations that were only for '\' matches # skip-blame because this was mechanically rewritten the following script. I ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t ones appear to be, and they run without addition failures on both Windows and Linux. import argparse import os import re ap = argparse.ArgumentParser() ap.add_argument('path', nargs='+') opts = ap.parse_args() globre = re.compile(r'^(.*) \(glob\)(.*)$') for p in opts.path: tmp = p + '.tmp' with open(p, 'rb') as src, open(tmp, 'wb') as dst: for line in src: m = globre.match(line) if not m or '$LOCALIP' in line or '*' in line: dst.write(line) continue if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'): dst.write(line) continue dst.write(m.group(1) + m.group(2) + '\n') os.unlink(p) os.rename(tmp, p)
2017-12-11 06:50:57 +03:00
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg
rebase: do not try to reactivate deleted divergent bookmark If the currently active bookmark is divergent one, it may be resolved during rebase. Trying to activate it will raise "KeyError: 'W@diverge'".
2014-02-15 11:19:19 +04:00
$ hg bookmarks
W 3:0d3554f74897
X 1:6c81ed0049f8
Y 2:49cb3485fa0c
Z 2:49cb3485fa0c
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
Keep bookmarks to the correct rebased changeset
$ cd ..
$ hg clone -q a a2
$ cd a2
$ hg up -q Z
$ hg rebase -s 1 -d 3
rebase: remove rev number from rebase output Summary: Revision numbers are deprecated, let's not print them in the rebase output. The tests were automatically fixed with run-tests.py -i Reviewed By: quark-zju Differential Revision: D17936451 fbshipit-source-id: a8f0403b6af4573421ca874e9311f26931eba697
2019-10-16 02:28:01 +03:00
rebasing 6c81ed0049f8 "B" (X)
rebasing 49cb3485fa0c "C" (Y Z)
tests: remove (glob) annotations that were only for '\' matches # skip-blame because this was mechanically rewritten the following script. I ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t ones appear to be, and they run without addition failures on both Windows and Linux. import argparse import os import re ap = argparse.ArgumentParser() ap.add_argument('path', nargs='+') opts = ap.parse_args() globre = re.compile(r'^(.*) \(glob\)(.*)$') for p in opts.path: tmp = p + '.tmp' with open(p, 'rb') as src, open(tmp, 'wb') as dst: for line in src: m = globre.match(line) if not m or '$LOCALIP' in line or '*' in line: dst.write(line) continue if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'): dst.write(line) continue dst.write(m.group(1) + m.group(2) + '\n') os.unlink(p) os.rename(tmp, p)
2017-12-11 06:50:57 +03:00
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
$ tglog
@ 3: 3d5fa227f4b5 'C' Y Z
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 2: e926fccfa8ec 'B' X
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 1: 41acb9dca9eb 'D' W
bookmarks: correctly update current bookmarks on rebase (issue2277) When you rebased with a currently active bookmark, that bookmark would always point at the new tip, regardless of what revision it pointed at before the rebase. All bookmarks will now point at the equivalent post-rebase commit. However, the currently active bookmark will cease to be active unless it points at the new tip post-rebase. Rebase will always leave the new tip as the working copy parent, which is incompatible with having an active bookmark that points at some other revision. The common case should be that the active bookmark will point at the new tip post-rebase.
2012-06-22 22:40:31 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 0: 1994f17a630e 'A'
bookmarks: correctly update current bookmarks on rebase (issue2277) When you rebased with a currently active bookmark, that bookmark would always point at the new tip, regardless of what revision it pointed at before the rebase. All bookmarks will now point at the equivalent post-rebase commit. However, the currently active bookmark will cease to be active unless it points at the new tip post-rebase. Rebase will always leave the new tip as the working copy parent, which is incompatible with having an active bookmark that points at some other revision. The common case should be that the active bookmark will point at the new tip post-rebase.
2012-06-22 22:40:31 +04:00
Keep active bookmark on the correct changeset
$ cd ..
$ hg clone -q a a3
$ cd a3
$ hg up -q X
$ hg rebase -d W
rebase: remove rev number from rebase output Summary: Revision numbers are deprecated, let's not print them in the rebase output. The tests were automatically fixed with run-tests.py -i Reviewed By: quark-zju Differential Revision: D17936451 fbshipit-source-id: a8f0403b6af4573421ca874e9311f26931eba697
2019-10-16 02:28:01 +03:00
rebasing 6c81ed0049f8 "B" (X)
rebasing 49cb3485fa0c "C" (Y Z)
tests: remove (glob) annotations that were only for '\' matches # skip-blame because this was mechanically rewritten the following script. I ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t ones appear to be, and they run without addition failures on both Windows and Linux. import argparse import os import re ap = argparse.ArgumentParser() ap.add_argument('path', nargs='+') opts = ap.parse_args() globre = re.compile(r'^(.*) \(glob\)(.*)$') for p in opts.path: tmp = p + '.tmp' with open(p, 'rb') as src, open(tmp, 'wb') as dst: for line in src: m = globre.match(line) if not m or '$LOCALIP' in line or '*' in line: dst.write(line) continue if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'): dst.write(line) continue dst.write(m.group(1) + m.group(2) + '\n') os.unlink(p) os.rename(tmp, p)
2017-12-11 06:50:57 +03:00
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg
bookmarks: correctly update current bookmarks on rebase (issue2277) When you rebased with a currently active bookmark, that bookmark would always point at the new tip, regardless of what revision it pointed at before the rebase. All bookmarks will now point at the equivalent post-rebase commit. However, the currently active bookmark will cease to be active unless it points at the new tip post-rebase. Rebase will always leave the new tip as the working copy parent, which is incompatible with having an active bookmark that points at some other revision. The common case should be that the active bookmark will point at the new tip post-rebase.
2012-06-22 22:40:31 +04:00
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
$ tglog
o 3: 3d5fa227f4b5 'C' Y Z
bookmarks: correctly update current bookmarks on rebase (issue2277) When you rebased with a currently active bookmark, that bookmark would always point at the new tip, regardless of what revision it pointed at before the rebase. All bookmarks will now point at the equivalent post-rebase commit. However, the currently active bookmark will cease to be active unless it points at the new tip post-rebase. Rebase will always leave the new tip as the working copy parent, which is incompatible with having an active bookmark that points at some other revision. The common case should be that the active bookmark will point at the new tip post-rebase.
2012-06-22 22:40:31 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
@ 2: e926fccfa8ec 'B' X
bookmarks: correctly update current bookmarks on rebase (issue2277) When you rebased with a currently active bookmark, that bookmark would always point at the new tip, regardless of what revision it pointed at before the rebase. All bookmarks will now point at the equivalent post-rebase commit. However, the currently active bookmark will cease to be active unless it points at the new tip post-rebase. Rebase will always leave the new tip as the working copy parent, which is incompatible with having an active bookmark that points at some other revision. The common case should be that the active bookmark will point at the new tip post-rebase.
2012-06-22 22:40:31 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 1: 41acb9dca9eb 'D' W
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 0: 1994f17a630e 'A'
rebase: reset bookmarks (issue2265 and issue2873)
2011-07-15 22:07:19 +04:00
rebase: preserve active bookmark when not at head (issue3813) Now that the working directory parent is preserved, we can preserve the active bookmark too.
2013-10-14 19:12:59 +04:00
$ hg bookmarks
W 1:41acb9dca9eb
* X 2:e926fccfa8ec
Y 3:3d5fa227f4b5
Z 3:3d5fa227f4b5
rebase: derive node from target rev (issue3802) dest.rev() is the same as target when a new rebase is run, but dest isn't set when rebase --continue is run. Bug introduced in 97aaac321ced, which fixed issue3685.
2013-02-04 02:26:39 +04:00
rebase --continue with bookmarks present (issue3802)
$ hg up 2
rebase: preserve working directory parent (BC) Prior to this changeset, rebase always left the working directory as a parent of the last rebased changeset. The is dubious when, before the rebase, the working directory was not a parent of the tip most rebased changeset. With this changeset, we move the working directory back to its original parent. If the original parent was rebased, we use it's successors. This is a step toward solving issue3813 (rebase loses active bookmark if it's not on a head)
2013-10-14 18:12:29 +04:00
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
update: when deactivating a bookmark, print a message This helps prevent user confusion when innocent-seeming commands like 'hg update -C .' are run.
2014-05-14 23:49:55 +04:00
(leaving bookmark X)
rebase: derive node from target rev (issue3802) dest.rev() is the same as target when a new rebase is run, but dest isn't set when rebase --continue is run. Bug introduced in 97aaac321ced, which fixed issue3685.
2013-02-04 02:26:39 +04:00
$ echo 'C' > c
$ hg add c
$ hg ci -m 'other C'
$ hg up 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
tests: add an explicit destination in some rebase tests As we will make 'rebase' behave more like 'merge', it will no longer pick 'max(branch(.))' as the default destination. We have to hard code the expected destination is multiple tests where it matters. After a careful inspection none of theses tests really cares about the default destination behavior and just omitted one out of laziness.
2016-02-08 16:03:45 +03:00
$ hg rebase --dest 4
rebase: remove rev number from rebase output Summary: Revision numbers are deprecated, let's not print them in the rebase output. The tests were automatically fixed with run-tests.py -i Reviewed By: quark-zju Differential Revision: D17936451 fbshipit-source-id: a8f0403b6af4573421ca874e9311f26931eba697
2019-10-16 02:28:01 +03:00
rebasing 3d5fa227f4b5 "C" (Y Z)
rebase: derive node from target rev (issue3802) dest.rev() is the same as target when a new rebase is run, but dest isn't set when rebase --continue is run. Bug introduced in 97aaac321ced, which fixed issue3685.
2013-02-04 02:26:39 +04:00
merging c
filemerge: add number of textual conflicts in each file to error message Summary: When you get an error, let's print the number of conflicts in each file. This will give the user some sense of how much work they have to do. The code change is entirely in `filemerge.py`, and `tests/test-merge-conflict-count.t` adds a new test. Reviewed By: quark-zju Differential Revision: D9815243 fbshipit-source-id: 1b73a1db293902ac7242997a7d6ae09478344068
2018-10-22 22:45:46 +03:00
warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
2013-02-09 02:27:59 +04:00
unresolved conflicts (see hg resolve, then hg rebase --continue)
dispatch: exit with status 1 for an InterventionRequired exception (bc)
2013-02-09 02:17:46 +04:00
[1]
rebase: derive node from target rev (issue3802) dest.rev() is the same as target when a new rebase is run, but dest isn't set when rebase --continue is run. Bug introduced in 97aaac321ced, which fixed issue3685.
2013-02-04 02:26:39 +04:00
$ echo 'c' > c
$ hg resolve --mark c
resolve: add parenthesis around "no more unresolved files" message This message may be confused with an error message. Adding parenthesis around it will make it more recognisable as an informative message.
2014-07-26 05:32:49 +04:00
(no more unresolved files)
rebase: hook afterresolvedstates
2015-12-24 23:41:40 +03:00
continue: hg rebase --continue
rebase: derive node from target rev (issue3802) dest.rev() is the same as target when a new rebase is run, but dest isn't set when rebase --continue is run. Bug introduced in 97aaac321ced, which fixed issue3685.
2013-02-04 02:26:39 +04:00
$ hg rebase --continue
rebase: remove rev number from rebase output Summary: Revision numbers are deprecated, let's not print them in the rebase output. The tests were automatically fixed with run-tests.py -i Reviewed By: quark-zju Differential Revision: D17936451 fbshipit-source-id: a8f0403b6af4573421ca874e9311f26931eba697
2019-10-16 02:28:01 +03:00
rebasing 3d5fa227f4b5 "C" (Y Z)
tests: remove (glob) annotations that were only for '\' matches # skip-blame because this was mechanically rewritten the following script. I ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t ones appear to be, and they run without addition failures on both Windows and Linux. import argparse import os import re ap = argparse.ArgumentParser() ap.add_argument('path', nargs='+') opts = ap.parse_args() globre = re.compile(r'^(.*) \(glob\)(.*)$') for p in opts.path: tmp = p + '.tmp' with open(p, 'rb') as src, open(tmp, 'wb') as dst: for line in src: m = globre.match(line) if not m or '$LOCALIP' in line or '*' in line: dst.write(line) continue if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'): dst.write(line) continue dst.write(m.group(1) + m.group(2) + '\n') os.unlink(p) os.rename(tmp, p)
2017-12-11 06:50:57 +03:00
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
$ tglog
@ 4: 45c0f0ec1203 'C' Y Z
rebase: derive node from target rev (issue3802) dest.rev() is the same as target when a new rebase is run, but dest isn't set when rebase --continue is run. Bug introduced in 97aaac321ced, which fixed issue3685.
2013-02-04 02:26:39 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 3: b0e10b7175fd 'other C'
rebase: derive node from target rev (issue3802) dest.rev() is the same as target when a new rebase is run, but dest isn't set when rebase --continue is run. Bug introduced in 97aaac321ced, which fixed issue3685.
2013-02-04 02:26:39 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 2: e926fccfa8ec 'B' X
rebase: derive node from target rev (issue3802) dest.rev() is the same as target when a new rebase is run, but dest isn't set when rebase --continue is run. Bug introduced in 97aaac321ced, which fixed issue3685.
2013-02-04 02:26:39 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 1: 41acb9dca9eb 'D' W
rebase: derive node from target rev (issue3802) dest.rev() is the same as target when a new rebase is run, but dest isn't set when rebase --continue is run. Bug introduced in 97aaac321ced, which fixed issue3685.
2013-02-04 02:26:39 +04:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
o 0: 1994f17a630e 'A'
rebase: derive node from target rev (issue3802) dest.rev() is the same as target when a new rebase is run, but dest isn't set when rebase --continue is run. Bug introduced in 97aaac321ced, which fixed issue3685.
2013-02-04 02:26:39 +04:00
tests: add missing trailing 'cd ..' Many tests didn't change back from subdirectories at the end of the tests ... and they don't have to. The missing 'cd ..' could always be added when another test case is added to the test file. This change do that tests (99.5%) consistently end up in $TESTDIR where they started, thus making it simpler to extend them or move them around.
2012-06-11 03:40:51 +04:00
rebase: handle bookmarks matching revset function names (issue3950) We handled these correctly with all rev-specifying options except, somehow, -r/--rev.
2013-09-03 23:12:35 +04:00
ensure that bookmarks given the names of revset functions can be used
as --rev arguments (issue3950)
$ hg update -q 3
$ echo bimble > bimble
$ hg add bimble
$ hg commit -q -m 'bisect'
$ echo e >> bimble
$ hg ci -m bisect2
$ echo e >> bimble
$ hg ci -m bisect3
$ hg book bisect
$ hg update -q Y
$ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z
rebase: remove rev number from rebase output Summary: Revision numbers are deprecated, let's not print them in the rebase output. The tests were automatically fixed with run-tests.py -i Reviewed By: quark-zju Differential Revision: D17936451 fbshipit-source-id: a8f0403b6af4573421ca874e9311f26931eba697
2019-10-16 02:28:01 +03:00
rebasing 345c90f326a4 "bisect"
rebasing f677a2907404 "bisect2"
tags: remove tip tag Summary: In a future diff we'll be removing tags. The most prevalent tag is 'tip', which shows up in a ton of test output. Let's drop that tag first, so we can safely update the tests before we drop tags entirely. Reviewed By: xavierd Differential Revision: D18995058 fbshipit-source-id: 8c63710cd4ed567ea24e32724b8660f9006a61f1
2019-12-18 00:45:17 +03:00
rebasing 325c16001345 "bisect3" (bisect)
tests: remove (glob) annotations that were only for '\' matches # skip-blame because this was mechanically rewritten the following script. I ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t ones appear to be, and they run without addition failures on both Windows and Linux. import argparse import os import re ap = argparse.ArgumentParser() ap.add_argument('path', nargs='+') opts = ap.parse_args() globre = re.compile(r'^(.*) \(glob\)(.*)$') for p in opts.path: tmp = p + '.tmp' with open(p, 'rb') as src, open(tmp, 'wb') as dst: for line in src: m = globre.match(line) if not m or '$LOCALIP' in line or '*' in line: dst.write(line) continue if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'): dst.write(line) continue dst.write(m.group(1) + m.group(2) + '\n') os.unlink(p) os.rename(tmp, p)
2017-12-11 06:50:57 +03:00
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 80d53a39fbcc. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727
2017-09-18 20:54:00 +03:00
Bookmark and working parent get moved even if --keep is set (issue5682)
$ hg init $TESTTMP/book-keep
$ cd $TESTTMP/book-keep
drawdag: use bookmarks instead of tags Summary: A future diff will remove tags entirely, so let's move drawdag to be bookmark based. Reviewed By: quark-zju Differential Revision: D18995059 fbshipit-source-id: 70ef67259b37ef9821009d0145aa1e03c09b1309
2019-12-17 05:10:38 +03:00
$ drawdag <<'EOS'
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 80d53a39fbcc. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727
2017-09-18 20:54:00 +03:00
> B C
> |/
> A
> EOS
drawdag: use bookmarks instead of tags Summary: A future diff will remove tags entirely, so let's move drawdag to be bookmark based. Reviewed By: quark-zju Differential Revision: D18995059 fbshipit-source-id: 70ef67259b37ef9821009d0145aa1e03c09b1309
2019-12-17 05:10:38 +03:00
$ hg up -q $B
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
$ tglog
drawdag: use bookmarks instead of tags Summary: A future diff will remove tags entirely, so let's move drawdag to be bookmark based. Reviewed By: quark-zju Differential Revision: D18995059 fbshipit-source-id: 70ef67259b37ef9821009d0145aa1e03c09b1309
2019-12-17 05:10:38 +03:00
o 2: dc0947a82db8 'C'
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 80d53a39fbcc. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727
2017-09-18 20:54:00 +03:00
|
drawdag: use bookmarks instead of tags Summary: A future diff will remove tags entirely, so let's move drawdag to be bookmark based. Reviewed By: quark-zju Differential Revision: D18995059 fbshipit-source-id: 70ef67259b37ef9821009d0145aa1e03c09b1309
2019-12-17 05:10:38 +03:00
| @ 1: 112478962961 'B'
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 80d53a39fbcc. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727
2017-09-18 20:54:00 +03:00
|/
drawdag: use bookmarks instead of tags Summary: A future diff will remove tags entirely, so let's move drawdag to be bookmark based. Reviewed By: quark-zju Differential Revision: D18995059 fbshipit-source-id: 70ef67259b37ef9821009d0145aa1e03c09b1309
2019-12-17 05:10:38 +03:00
o 0: 426bada5c675 'A'
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 80d53a39fbcc. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727
2017-09-18 20:54:00 +03:00
drawdag: use bookmarks instead of tags Summary: A future diff will remove tags entirely, so let's move drawdag to be bookmark based. Reviewed By: quark-zju Differential Revision: D18995059 fbshipit-source-id: 70ef67259b37ef9821009d0145aa1e03c09b1309
2019-12-17 05:10:38 +03:00
$ hg rebase -r $B -d $C --keep
rebasing 112478962961 "B"
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
$ tglog
drawdag: use bookmarks instead of tags Summary: A future diff will remove tags entirely, so let's move drawdag to be bookmark based. Reviewed By: quark-zju Differential Revision: D18995059 fbshipit-source-id: 70ef67259b37ef9821009d0145aa1e03c09b1309
2019-12-17 05:10:38 +03:00
@ 3: 9769fc65c4c5 'B'
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 80d53a39fbcc. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727
2017-09-18 20:54:00 +03:00
|
drawdag: use bookmarks instead of tags Summary: A future diff will remove tags entirely, so let's move drawdag to be bookmark based. Reviewed By: quark-zju Differential Revision: D18995059 fbshipit-source-id: 70ef67259b37ef9821009d0145aa1e03c09b1309
2019-12-17 05:10:38 +03:00
o 2: dc0947a82db8 'C'
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 80d53a39fbcc. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727
2017-09-18 20:54:00 +03:00
|
tests: fold tglog into tinit; standardize Summary: Like D9323267, hg tests commonly reinvent common aliases to render the DAG, and they often differ very slightly. This makes adding a test require more boilerplate, and reading a test in a foreign new area slightly more overhead. Let's standardize these to reduce the copypasta. It's necessary to define this as a shell function instead of an hgrc alias to prevent tests that list aliases from printing it. Plus that enforces a nice separation of test/stdlib logic. Bookmarks and branches are easy enough to add since they're empty if not used. A good number added `{phase}` -- I renamed this to `tglogp`. Reviewed By: quark-zju Differential Revision: D9347072 fbshipit-source-id: 6aac7de3e65d2295a7ebecd2ab30901709af3ff1
2018-08-16 20:37:29 +03:00
| o 1: 112478962961 'B'
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 80d53a39fbcc. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727
2017-09-18 20:54:00 +03:00
|/
drawdag: use bookmarks instead of tags Summary: A future diff will remove tags entirely, so let's move drawdag to be bookmark based. Reviewed By: quark-zju Differential Revision: D18995059 fbshipit-source-id: 70ef67259b37ef9821009d0145aa1e03c09b1309
2019-12-17 05:10:38 +03:00
o 0: 426bada5c675 'A'
rebase: move bookmarks with --keep (issue5682) This is a regression caused by 80d53a39fbcc. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727
2017-09-18 20:54:00 +03:00
Reference in New Issue Copy Permalink