facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-08 06:37:26 +03:00
Code Issues Projects Releases Wiki Activity
212cec117b
sapling/eden/scm/tests/test-bookmarks-rebase.t

107 lines
2.5 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
config: enable obsstore by default Summary: This makes tests closer to production setup and removes a bunch of "saved backup bundle to ..." messages. With D9236657, this should not hurt server-side performance. Unfortunately a lot tests cannot be migrated easily, mostly because revision numbers are used. They are left with a TODO. Reviewed By: DurhamG Differential Revision: D9237694 fbshipit-source-id: c993fce18f07aba09f6d70964e248af8d501575a
2018-10-27 04:52:14 +03:00
TODO: Make this test compatibile with obsstore enabled.
$ setconfig experimental.evolution=
tests: unify test-bookmarks-rebase
2010-08-14 04:59:48 +04:00
$ echo "[extensions]" >> $HGRCPATH
$ echo "rebase=" >> $HGRCPATH
initialize repository
$ hg init
$ echo 'a' > a
$ hg ci -A -m "0"
adding a
$ echo 'b' > b
$ hg ci -A -m "1"
adding b
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo 'c' > c
$ hg ci -A -m "2"
adding c
$ echo 'd' > d
$ hg ci -A -m "3"
adding d
$ hg bookmark -r 1 one
$ hg bookmark -r 3 two
bookmarks: fix bug that activated a bookmark even with -r passed If the current revision was the target revision of -r, then the bookmark would be active. Test cases have been updated accordingly.
2013-05-02 00:24:21 +04:00
$ hg up -q two
tests: unify test-bookmarks-rebase
2010-08-14 04:59:48 +04:00
bookmark list
$ hg bookmark
one 1:925d80f479bb
localrepo: sort hg bookmark output sort bookmarks before we write them to stdout to get a predictable output.
2011-02-11 22:35:32 +03:00
* two 3:2ae46b1d99a7
tests: unify test-bookmarks-rebase
2010-08-14 04:59:48 +04:00
rebase
tests: use regular expressions instead of helpers
2010-08-16 05:58:03 +04:00
$ hg rebase -s two -d one
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 2ae46b1d99a7 "3" (two)
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/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
tests: unify test-bookmarks-rebase
2010-08-14 04:59:48 +04:00
$ hg log
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
changeset: 3:42e5ed2cdcf4
templater: add bookmarks to templates and default output as bookmarks are not dispalyed as tags anymore, we add a bookmark label to the changeset printer.
2011-02-11 21:47:39 +03:00
bookmark: two
tests: unify test-bookmarks-rebase
2010-08-14 04:59:48 +04:00
parent: 1:925d80f479bb
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3
changeset: 2:db815d6d32e6
parent: 0:f7b1eb17ad24
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
changeset: 1:925d80f479bb
bookmarks: make track.current=True default behaviour and remove option (BC)
2011-02-16 03:29:26 +03:00
bookmark: one
tests: unify test-bookmarks-rebase
2010-08-14 04:59:48 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
changeset: 0:f7b1eb17ad24
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
rebase: restore bookmark state on abort The bookmark state was already being preserved, but it wasn't being properly restored.
2015-04-13 21:54:02 +03:00
aborted rebase should restore active bookmark.
$ hg up 1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark two)
$ echo 'e' > d
$ hg ci -A -m "4"
adding d
$ hg bookmark three
$ hg rebase -s three -d two
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 dd7c838e8362 "4" (three)
rebase: restore bookmark state on abort The bookmark state was already being preserved, but it wasn't being properly restored.
2015-04-13 21:54:02 +03:00
merging d
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 d! (edit, then use 'hg resolve --mark')
rebase: restore bookmark state on abort The bookmark state was already being preserved, but it wasn't being properly restored.
2015-04-13 21:54:02 +03:00
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg rebase --abort
rebase aborted
$ hg bookmark
one 1:925d80f479bb
* three 4:dd7c838e8362
two 3:42e5ed2cdcf4
rebase: check that the bookmark is still valid when restoring (issue4669) After a rebase --abort, we attempt to restore the previously active bookmark. We need to ensure that the bookmark still exists.
2015-05-15 07:35:06 +03:00
after aborted rebase, restoring a bookmark that has been removed should not fail
$ hg rebase -s three -d two
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 dd7c838e8362 "4" (three)
rebase: check that the bookmark is still valid when restoring (issue4669) After a rebase --abort, we attempt to restore the previously active bookmark. We need to ensure that the bookmark still exists.
2015-05-15 07:35:06 +03:00
merging d
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 d! (edit, then use 'hg resolve --mark')
rebase: check that the bookmark is still valid when restoring (issue4669) After a rebase --abort, we attempt to restore the previously active bookmark. We need to ensure that the bookmark still exists.
2015-05-15 07:35:06 +03:00
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg bookmark -d three
$ hg rebase --abort
rebase aborted
$ hg bookmark
one 1:925d80f479bb
two 3:42e5ed2cdcf4
Reference in New Issue Copy Permalink