facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-06 21:48:36 +03:00
Code Issues Projects Releases Wiki Activity

perftweaks: move commit head detection removal logic to core

Browse Source 
Summary: Also change the internal API so it no longer accepts the "heads" argument.

Reviewed By: ryanmce

Differential Revision: D6745865

fbshipit-source-id: 368742be49b192f7630421003552d0a10eb0b76d
This commit is contained in:
Jun Wu 2018-01-23 12:08:19 -08:00 committed by Saurabh Singh
parent e1ec40a30f
commit 7fa918cefd
253 changed files with 7 additions and 650 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hgext/perftweaks.py
View File

@ -16,7 +16,6 @@
from mercurial import (
branchmap,
commands,
dispatch,
extensions,
localrepo,
@ -42,7 +41,6 @@ def extsetup(ui):
wrapfunction(branchmap, 'read', _branchmapread)
wrapfunction(branchmap, 'replacecache', _branchmapreplacecache)
wrapfunction(branchmap, 'updatecache', _branchmapupdatecache)
wrapfunction(commands, '_docommit', _docommit)
if ui.configbool('perftweaks', 'preferdeltas'):
wrapfunction(revlog.revlog, '_isgooddelta', _isgooddelta)
@ -191,22 +189,6 @@ def _branchmapupdatecache(orig, repo):
partial.update(repo, None)
repo._branchcaches[repo.filtername] = partial
# _docommit accesses "branchheads" just to decide whether to show "(created new
# head)" or not. Accessing branchheads requires calling "headrevs()" which is
# expensive since it scans entire changelog. We don't use named branches and
# do not worry about multiple heads.
def _docommit(orig, ui, repo, *pats, **opts):
# developer config: perftweaks.disableheaddetection
if not repo.ui.configbool('perftweaks', 'disableheaddetection'):
return orig(ui, repo, *pats, **opts)
def _fakedbranchheads(orig, repo, *args, **kwargs):
# Make "." a "head" so the "created new head" message won't be printed.
return [repo['.'].node()]
with extensions.wrappedfunction(localrepo.localrepository,
'branchheads', _fakedbranchheads):
return orig(ui, repo, *pats, **opts)
def _branchmapwrite(orig, self, repo):
if repo.ui.configbool('perftweaks', 'disablebranchcache2'):
# Since we don't read the branchcache, don't bother writing it.

34
mercurial/cmdutil.py
View File

@ -3401,44 +3401,12 @@ def buildcommittext(repo, ctx, subs, extramsg):
return "\n".join(edittext)
def commitstatus(repo, node, branch, bheads=None, opts=None):
def commitstatus(repo, node, branch, opts=None):
if opts is None:
opts = {}
ctx = repo[node]
parents = ctx.parents()
if (not opts.get('amend') and bheads and node not in bheads and not
[x for x in parents if x.node() in bheads and x.branch() == branch]):
repo.ui.status(_('created new head\n'))
# The message is not printed for initial roots. For the other
# changesets, it is printed in the following situations:
#
# Par column: for the 2 parents with ...
# N: null or no parent
# B: parent is on another named branch
# C: parent is a regular non head changeset
# H: parent was a branch head of the current branch
# Msg column: whether we print "created new head" message
# In the following, it is assumed that there already exists some
# initial branch heads of the current branch, otherwise nothing is
# printed anyway.
#
# Par Msg Comment
# N N y additional topo root
#
# B N y additional branch root
# C N y additional topo head
# H N n usual case
#
# B B y weird additional branch root
# C B y branch merge
# H B n merge with named branch
#
# C C y additional head from merge
# C H n merge with a head
#
# H H n head merge: head count decreases
if not opts.get('close_branch'):
for r in parents:
if r.closesbranch() and r.branch() == branch:

7
mercurial/commands.py
View File

@ -604,7 +604,6 @@ def _dobackout(ui, repo, node=None, rev=None, **opts):
# the backout should appear on the same branch
branch = repo.dirstate.branch()
bheads = repo.branchheads(branch)
rctx = scmutil.revsingle(repo, hex(parent))
if not opts.get('merge') and op1 != node:
dsguard = dirstateguard.dirstateguard(repo, 'backout')
@ -647,7 +646,7 @@ def _dobackout(ui, repo, node=None, rev=None, **opts):
if not newnode:
ui.status(_("nothing changed\n"))
return 1
cmdutil.commitstatus(repo, newnode, branch, bheads)
cmdutil.commitstatus(repo, newnode, branch)
def nice(node):
return '%d:%s' % (repo.changelog.rev(node), short(node))
@ -1526,10 +1525,10 @@ def _docommit(ui, repo, *pats, **opts):
cmdutil.checkunfinished(repo, commit=True)
branch = repo[None].branch()
bheads = repo.branchheads(branch)
extra = {}
if opts.get('close_branch'):
bheads = repo.branchheads(branch)
extra['close'] = 1
if not bheads:
@ -1590,7 +1589,7 @@ def _docommit(ui, repo, *pats, **opts):
ui.status(_("nothing changed\n"))
return 1
cmdutil.commitstatus(repo, node, branch, bheads, opts)
cmdutil.commitstatus(repo, node, branch, opts=opts)
@command('config|showconfig|debugconfig',
[('u', 'untrusted', None, _('show untrusted configuration options')),

1
tests/test-add.t
View File

@ -98,7 +98,6 @@ should fail
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo aaa > a
$ hg ci -m 2
created new head
$ hg merge
merging a

7
tests/test-annotate.t
View File

@ -174,7 +174,6 @@ annotate -nlf b
> b5
> EOF
$ hg ci -mb2.1 -d '2 0'
created new head
$ hg merge
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@ -210,7 +209,6 @@ annotate after merge with -l
> a
> EOF
$ hg ci -mc -d '3 0'
created new head
$ hg merge
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@ -651,7 +649,6 @@ merge
$ hg up 24 --quiet
$ echo 7 >> baz
$ hg ci -m 'one more line, out of line range'
created new head
$ sed 's/3+/3-/' baz > baz.new
$ mv baz.new baz
$ hg ci -m 'baz:3+->3-'
@ -680,7 +677,6 @@ merge
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'merge from other side'
created new head
$ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
16: baz:0
19: baz:3
@ -700,7 +696,6 @@ we follow all branches in descending direction
$ sed 's/3/+3/' baz > baz.new
$ mv baz.new baz
$ hg ci -m 'baz:3->+3'
created new head
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 2:5, startrev=16, descend=True)' --graph
@ 30: baz:3->+3
:
@ -743,7 +738,6 @@ track of possible further descendants in specified range.
> z
> EOF
$ hg ci -m 'baz: mostly rewrite with some content from 24'
created new head
$ hg merge --tool :merge-other 24
merging baz
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -912,7 +906,6 @@ create history with a filerev whose linkrev points to another branch
$ echo unrelated > unrelated
$ hg commit -Am 'unrelated'
adding unrelated
created new head
$ hg graft -r 'desc(contentB)'
grafting 1:fd27c222e3e6 "contentB"
$ echo C >> a

1
tests/test-audit-path.t
View File

@ -41,7 +41,6 @@ Test symlink traversing when accessing history:
$ echo c > b/a
$ hg add b/a
$ hg ci -m 'add directory b'
created new head
Test that hg cat does not do anything wrong the working copy has 'b' as directory

14
tests/test-automv.t
View File

@ -43,7 +43,6 @@ mv/rm/add/modif
R a.txt
$ hg commit -m 'msg'
detected move of 1 files
created new head
$ hg status --change . -C
A b.txt
a.txt
@ -60,7 +59,6 @@ mv/rm/add/modif
A b.txt
R a.txt
$ hg commit -m 'msg'
created new head
$ hg status --change . -C
A b.txt
R a.txt
@ -77,7 +75,6 @@ mv/rm/add/modif/changethreshold
R a.txt
$ hg commit --config automv.similarity='60' -m 'msg'
detected move of 1 files
created new head
$ hg status --change . -C
A b.txt
a.txt
@ -110,7 +107,6 @@ mv/rm/add/notincommitfiles
A c.txt
R a.txt
$ hg commit c.txt -m 'msg'
created new head
$ hg status --change . -C
A c.txt
$ hg status -C
@ -123,7 +119,6 @@ mv/rm/add/notincommitfiles
$ hg add c.txt
$ hg commit -m 'msg'
detected move of 1 files
created new head
$ hg status --change . -C
A b.txt
a.txt
@ -140,7 +135,6 @@ mv/rm/add/--no-automv
A b.txt
R a.txt
$ hg commit --no-automv -m 'msg'
created new head
$ hg status --change . -C
A b.txt
R a.txt
@ -153,7 +147,6 @@ mv/rm/add
$ echo 'c' > c.txt
$ hg add c.txt
$ hg commit -m 'revision to amend to'
created new head
$ mv a.txt b.txt
$ hg rm a.txt
$ hg add b.txt
@ -175,7 +168,6 @@ mv/rm/add/modif
$ echo 'c' > c.txt
$ hg add c.txt
$ hg commit -m 'revision to amend to'
created new head
$ mv a.txt b.txt
$ hg rm a.txt
$ hg add b.txt
@ -198,7 +190,6 @@ mv/rm/add/modif
$ echo 'c' > c.txt
$ hg add c.txt
$ hg commit -m 'revision to amend to'
created new head
$ mv a.txt b.txt
$ hg rm a.txt
$ hg add b.txt
@ -219,7 +210,6 @@ mv/rm/add/modif/changethreshold
$ echo 'c' > c.txt
$ hg add c.txt
$ hg commit -m 'revision to amend to'
created new head
$ mv a.txt b.txt
$ hg rm a.txt
$ hg add b.txt
@ -242,7 +232,6 @@ mv
$ echo 'c' > c.txt
$ hg add c.txt
$ hg commit -m 'revision to amend to'
created new head
$ mv a.txt b.txt
$ hg status -C
! a.txt
@ -259,7 +248,6 @@ mv/rm/add/notincommitfiles
$ echo 'c' > c.txt
$ hg add c.txt
$ hg commit -m 'revision to amend to'
created new head
$ mv a.txt b.txt
$ hg rm a.txt
$ hg add b.txt
@ -293,7 +281,6 @@ mv/rm/add/--no-automv
$ echo 'c' > c.txt
$ hg add c.txt
$ hg commit -m 'revision to amend to'
created new head
$ mv a.txt b.txt
$ hg rm a.txt
$ hg add b.txt
@ -313,7 +300,6 @@ mv/rm/commit/add/amend
$ echo 'c' > c.txt
$ hg add c.txt
$ hg commit -m 'revision to amend to'
created new head
$ mv a.txt b.txt
$ hg rm a.txt
$ hg status -C

7
tests/test-backout.t
View File

@ -187,7 +187,6 @@ should fail
$ echo c > c
$ hg ci -Am2
adding c
created new head
$ hg summary
parent: 2:db815d6d32e6 tip
2
@ -237,7 +236,6 @@ remove line 1
$ hg backout --merge -d '3 0' 1 --tool=true
reverting a
created new head
changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182
merging with changeset 3:26b8ccb9ad91
merging a
@ -295,7 +293,6 @@ invocation of the hook to be examined)
2:6ea3f2a197a2
====
reverting a
created new head
changeset 3:d92a3f57f067 backs out changeset 1:5a50a024c182
==== preupdate:
3:d92a3f57f067
@ -329,7 +326,6 @@ invocation of the hook to be examined)
1:5a50a024c182
====
reverting a
created new head
changeset 3:d92a3f57f067 backs out changeset 1:5a50a024c182
==== update:
2:6ea3f2a197a2
@ -391,7 +387,6 @@ without --merge
with --merge
$ hg backout --merge -d '3 0' 1 --tool=true
reverting a
created new head
changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5
merging with changeset 3:3202beb76721
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -420,7 +415,6 @@ with --merge
$ echo d > d
$ hg commit -d '3 0' -A -m c
adding d
created new head
$ hg merge 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@ -544,7 +538,6 @@ explicitly regardless of '--message')
HG: user: test
HG: branch 'branch2'
HG: removed file1
created new head
changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3
merging with changeset 3:d4e8f6db59fb
0 files updated, 0 files merged, 1 files removed, 0 files unresolved

9
tests/test-bheads.t
View File

@ -66,7 +66,6 @@
$ echo 'bh2' >bh2
$ hg add bh2
$ hg commit -m "Adding b branch head 2"
created new head
$ heads
4: Adding b branch head 2 (b)
3: Adding b branch head 1 (b)
@ -83,7 +82,6 @@
$ echo 'bh3' >bh3
$ hg add bh3
$ hg commit -m "Adding b branch head 3"
created new head
$ heads
5: Adding b branch head 3 (b)
4: Adding b branch head 2 (b)
@ -273,7 +271,6 @@ Topological heads:
$ cd ..
______________
"created new head" message tests
$ hg init newheadmsg
$ cd newheadmsg
@ -303,7 +300,6 @@ Case NN: msg
$ echo 1 > bb
$ hg ci -Am "b4 (NN): new topo root for branch b"
adding bb
created new head
Case HN: no msg
@ -317,7 +313,6 @@ Case BN: msg
$ echo 1 > aa
$ hg ci -Am "a6 (BN): new branch root"
adding aa
created new head
Case CN: msg
@ -325,7 +320,6 @@ Case CN: msg
$ echo 3 >> bbb
$ hg ci -Am "b7 (CN): regular new head"
adding bbb
created new head
Case BB: msg
@ -334,14 +328,12 @@ Case BB: msg
$ hg branch -f default
marked working directory as branch default
$ hg ci -m "a8 (BB): weird new branch root"
created new head
Case CB: msg
$ hg up -q 4
$ hg merge -q 1
$ hg ci -m "b9 (CB): new head from branch merge"
created new head
Case HB: no msg
@ -354,7 +346,6 @@ Case CC: msg
$ hg up -q 4
$ hg merge -q 2
$ hg ci -m "b11 (CC): new head from merge"
created new head
Case CH: no msg

6
tests/test-bisect2.t
View File

@ -49,7 +49,6 @@ create branch
$ echo '5' >> b
$ hg add b
$ hg ci -m "5" -d "5 0"
created new head
merge
@ -65,7 +64,6 @@ create branch
$ echo '7' > c
$ hg add c
$ hg ci -m "7" -d "7 0"
created new head
create branch
@ -74,7 +72,6 @@ create branch
$ echo '8' > d
$ hg add d
$ hg ci -m "8" -d "8 0"
created new head
$ echo '9' >> d
$ hg ci -m "9" -d "9 0"
@ -92,7 +89,6 @@ create branch
$ echo '11' > e
$ hg add e
$ hg ci -m "11" -d "11 0"
created new head
$ echo '12' >> e
$ hg ci -m "12" -d "12 0"
$ echo '13' >> e
@ -105,7 +101,6 @@ create branch
$ echo '14' > f
$ hg add f
$ hg ci -m "14" -d "14 0"
created new head
merge
@ -126,7 +121,6 @@ create branch
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo '18' >> e
$ hg ci -m "18" -d "18 0"
created new head
log

2
tests/test-bisect3.t
View File

@ -31,7 +31,6 @@ branch 4-8
$ echo '4' >c
$ hg add c
$ hg ci -u test -d '4 0' -m '4'
created new head
$ echo '5' >c
$ hg ci -u test -d '5 0' -m '5'
$ echo '6' >c
@ -62,7 +61,6 @@ unrelated branch
$ echo '13' >d
$ hg add d
$ hg ci -u test -d '13 0' -m '13'
created new head
$ echo '14' >d
$ hg ci -u test -d '14 0' -m '14'

2
tests/test-blackbox.t
View File

@ -49,7 +49,6 @@ create two heads to verify that we only see one change in the log later
$ echo b > b
$ hg commit -Amb
adding b
created new head
clone, commit, pull
$ hg clone . ../blackboxtest2
@ -127,7 +126,6 @@ backup bundles get logged
$ touch d
$ hg commit -Amd
adding d
created new head
$ hg strip tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob)

2
tests/test-bookmarks-merge.t
View File

@ -12,7 +12,6 @@
$ echo c > c
$ hg add c
$ hg commit -m'c'
created new head
# test merging of diverged bookmarks
$ hg bookmark -r 1 "c@diverge"
@ -42,7 +41,6 @@
$ echo e > e
$ hg add e
$ hg commit -m'e'
created new head
$ hg up -C 5
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bookmark e

3
tests/test-bookmarks-pushpull.t
View File

@ -484,7 +484,6 @@ update a remote bookmark from a non-head to a head
$ echo c3 > f2
$ hg ci -Am3
adding f2
created new head
$ hg push ../a --config "$TESTHOOK"
pushing to ../a
searching for changes
@ -621,7 +620,6 @@ diverging a remote bookmark fails
$ echo c4 > f2
$ hg ci -Am4
adding f2
created new head
$ echo c5 > f2
$ hg ci -Am5
$ hg log -G
@ -935,7 +933,6 @@ pushing a new bookmark on a new head does not require -f if -B is specified
$ hg book W
$ echo c5 > f2
$ hg ci -Am5
created new head
$ hg push -B .
pushing to http://localhost:$HGPORT/
searching for changes

2
tests/test-bookmarks-rebase.t
View File

@ -18,7 +18,6 @@ initialize repository
$ echo 'c' > c
$ hg ci -A -m "2"
adding c
created new head
$ echo 'd' > d
$ hg ci -A -m "3"
@ -74,7 +73,6 @@ aborted rebase should restore active bookmark.
$ echo 'e' > d
$ hg ci -A -m "4"
adding d
created new head
$ hg bookmark three
$ hg rebase -s three -d two
rebasing 4:dd7c838e8362 "4" (three tip)

1
tests/test-bookmarks-strip.t
View File

@ -45,7 +45,6 @@ update to -2 (deactivates the active bookmark)
commit new head
$ hg ci -m 3
created new head
bookmarks updated?

1
tests/test-bookmarks.t
View File

@ -175,7 +175,6 @@ bookmark rev 0 again
$ echo c > c
$ hg add c
$ hg commit -m 2
created new head
bookmarks X moved to rev 2, Y at rev -1, Z at rev 0

2
tests/test-branch-option.t
View File

@ -45,14 +45,12 @@ test branch selection options
marked working directory as branch \xc3\xa6 (esc)
$ echo ae2 > foo
$ hg ci -d '0 0' -mae2
created new head
$ hg up 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch -f b
marked working directory as branch b
$ echo b2 > foo
$ hg ci -d '0 0' -mb2
created new head
unknown branch and fallback

2
tests/test-branches.t
View File

@ -175,7 +175,6 @@ verify update will accept invalid legacy branch names
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'xxx2' >> b
$ hg commit -d '8 0' -m 'adding head to branch b'
created new head
$ echo 'xxx3' >> b
$ hg commit -d '9 0' -m 'adding another cset to branch b'
$ hg branches
@ -452,7 +451,6 @@ multihead branch
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "m2" >m
$ hg commit -d '10 0' -m 'head 2'
created new head
$ hg log -b m
changeset: 17:df343b0df04f
branch: m

3
tests/test-bundle.t
View File

@ -21,7 +21,6 @@ Setting up test
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 1 >> afile
$ hg commit -m "1.1"
created new head
$ echo 2 >> afile
$ hg commit -m "1.2"
$ echo "a line" > fred
@ -749,7 +748,6 @@ bundle single branch
$ echo b >b
$ hg ci -Amb
adding b
created new head
$ echo b1 >b1
$ echo xx >x
$ hg ci -Amb1
@ -827,7 +825,6 @@ directory does not exist
$ echo "ddd" >> d
$ hg commit -A -m 3
adding d
created new head
$ hg update -r 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -G

4
tests/test-casecollision-merge.t
View File

@ -26,7 +26,6 @@ this is also case for issue3370.
$ touch x
$ hg add x
$ hg commit -m '#2'
created new head
$ hg tag -l C
$ hg merge -q
@ -68,7 +67,6 @@ additional test for issue3452:
$ echo "modify 'a' at (E)" > a
$ echo "modify 'b' at (E)" > b
$ hg commit -m '(E)'
created new head
$ hg tag -l E
$ hg update -q --clean D
@ -95,7 +93,6 @@ target file is not 'a'/'A' but 'b'/'B' in this case.
$ hg rename b tmp
$ hg rename tmp B
$ hg commit -m '(B1)'
created new head
$ hg tag -l B1
$ hg merge -q C
@ -139,7 +136,6 @@ target file is not 'a'/'A' but 'b'/'B' in this case.
$ echo x > x
$ hg add x
$ hg commit -m '#3'
created new head
$ echo 'modified at #4' > a
$ hg commit -m '#4'

2
tests/test-censor.t
View File

@ -45,7 +45,6 @@ the second head H2, and so on
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'Tainted file now super sanitized' > target
$ hg ci -m 'super sanitized' target
created new head
$ H2=`hg id --debug -i`
Verify target contents before censorship at each revision
@ -384,7 +383,6 @@ Censored nodes can be pushed if they censor previously unexchanged nodes
$ echo 'Passwords: hunter2hunter2' > target
$ hg ci -m 're-add password from clone' target
created new head
$ H3=`hg id --debug -i`
$ REV=$H3
$ echo 'Re-sanitized; nothing to see here' > target

1
tests/test-changelog-exec.t
View File

@ -22,7 +22,6 @@ manifest of p2:
$ hg up -qC 0
$ echo >> foo
$ hg ci -m 'change foo'
created new head
manifest of p1:

6
tests/test-check-code.t
View File

@ -173,13 +173,7 @@ New errors are not allowed. Warnings are strongly discouraged.
tests/test-fb-hgext-myparent.t:56:
> $ hg help templates | grep -A2 myparent
don't use grep's context flags
tests/test-fb-hgext-rage.t:10:
> $ echo "rpmbin = /bin/rpm" >> .hg/hgrc
don't use explicit paths for tools
Skipping tests/test-fb-hgext-remotefilelog-bad-configs.t it has no-che?k-code (glob)
tests/test-fb-hgext-smartlog.t:483:
> $ hg help templates | egrep -A2 '(amend|fold|histedit|rebase|singlepublic|split|undo)'successor
don't use grep's context flags
tests/test-hggit-git-submodules.t:61:
> $ grep 'submodule "subrepo2"' -A2 .gitmodules > .gitmodules-new
don't use grep's context flags

2
tests/test-check-module-imports.t
View File

@ -342,6 +342,4 @@ outputs, which should be fixed later.
tests/test-fb-hgext-remotefilelog-histpack.py:24: imports not lexically sorted: mercurial.ui < pythonpath
tests/test-fb-hgext-remotefilelog-histpack.py:26: direct symbol import SMALLFANOUTCUTOFF, LARGEFANOUTPREFIX from hgext.remotefilelog.basepack
tests/test-fb-hgext-remotefilelog-histpack.py:26: imports from hgext.remotefilelog.basepack not lexically sorted: LARGEFANOUTPREFIX < SMALLFANOUTCUTOFF
tests/test-fb-hgext-undo.t:215: imports from mercurial not lexically sorted: merge < registrar
tests/test-fb-hgext-undo.t:215: imports from mercurial not lexically sorted: encoding < merge
[1]

1
tests/test-clone-r.t
View File

@ -19,7 +19,6 @@
$ echo 1 >> afile
$ hg commit -m "1.1"
created new head
$ echo 2 >> afile
$ hg commit -m "1.2"

2
tests/test-clone.t
View File

@ -732,12 +732,10 @@ Create repositories to test auto sharing functionality
$ hg -q up -r 0
$ echo head1 > foo
$ hg commit -m head1
created new head
$ hg bookmark head1
$ hg -q up -r 0
$ echo head2 > foo
$ hg commit -m head2
created new head
$ hg bookmark head2
$ hg -q up -r 0
$ hg branch branch1

4
tests/test-command-template.t
View File

@ -177,7 +177,6 @@ Second branch starting at nullrev:
$ echo second > second
$ hg add second
$ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>'
created new head
$ echo third > third
$ hg add third
@ -2910,7 +2909,6 @@ latesttag:
$ echo d >> head2
$ hg ci -Am h2d -d '3 0'
adding head2
created new head
$ echo e >> head2
$ hg ci -m h2e -d '4 0'
@ -4574,7 +4572,6 @@ columns. We don't care about other aspects of the graph rendering here.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ printf "third\nfirst\n" > file
$ hg commit -m "$wrappabletext"
created new head
$ hg merge
merging file
@ -4604,7 +4601,6 @@ columns. We don't care about other aspects of the graph rendering here.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ printf "third\nfirst\nsecond\n" > file
$ hg commit -m "$wrappabletext"
created new head
$ hg log --graph -T "{graphwidth}"
@ 3

1
tests/test-commandserver.t
View File

@ -478,7 +478,6 @@ cache of phase roots should be invalidated on strip (issue3827):
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
(leaving bookmark bm3)
*** runcommand commit -Am. a
created new head
*** runcommand log -Gq
@ 5:731265503d86
|

1
tests/test-commit-amend.t
View File

@ -487,7 +487,6 @@ first graft something so there's an additional entry:
$ echo z > z
$ hg ci -Am 'fork'
adding z
created new head
$ hg up 11
5 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg graft 12

2
tests/test-commit-unresolved.t
View File

@ -19,7 +19,6 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "D" >> A
$ commit "D" 3
created new head
Merging a conflict araises
@ -62,6 +61,5 @@ Test that if a file is removed but not marked resolved, the commit still fails
$ hg resolve -ma
(no more unresolved files)
$ hg commit -m merged
created new head
$ cd ..

1
tests/test-commit.t
View File

@ -319,7 +319,6 @@ Issue1049: Hg permits partial commit of merge without warning
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b >> a
$ hg ci -mc
created new head
$ HGMERGE=true hg merge
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved

1
tests/test-conflict.t
View File

@ -32,7 +32,6 @@
> Hop we are done.
> EOF
$ hg commit -m branch2
created new head
$ hg merge 1
merging a

1
tests/test-confused-revert.t
View File

@ -33,7 +33,6 @@ Should show b unknown and a back to normal:
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foo-b > a
$ hg commit -m "2b"
created new head
$ HGMERGE=true hg merge 1
merging a

1
tests/test-contrib-perf.t
View File

@ -23,7 +23,6 @@ Prepare repo:
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo merge-this >> a
$ hg commit -m merge-able
created new head
$ hg up -r 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

3
tests/test-convert-filemap.t
View File

@ -28,7 +28,6 @@
$ echo >> bar
$ echo >> quux
$ hg ci -d '3 0' -m '3: change bar quux'
created new head
$ hg up -qC 2
$ hg merge -qr 3
$ echo >> bar
@ -42,7 +41,6 @@
$ echo >> foo
$ echo 2 >> baz
$ hg ci -d '6 0' -m '6: change foo baz'
created new head
$ hg up -qC 5
$ hg merge -qr 6
$ echo >> bar
@ -508,7 +506,6 @@ test anonymous branch pruning
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b >> b
$ hg ci -m changeb
created new head
$ hg up 1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge

1
tests/test-convert-hg-sink.t
View File

@ -339,7 +339,6 @@ More source changes
$ cd source
$ echo 1 >> a
$ hg ci -m '8: source first branch'
created new head
$ hg up -qr -2
$ echo 2 >> a
$ hg ci -m '9: source second branch'

3
tests/test-convert-hg-source.t
View File

@ -15,7 +15,6 @@
$ hg copy --after --force foo bar
$ hg copy foo baz
$ hg ci -m 'make bar and baz copies of foo' -d '2 0'
created new head
Test that template can print all file copies (issue4362)
$ hg log -r . --template "{file_copies % ' File: {file_copy}\n'}"
@ -37,7 +36,6 @@ Test that template can print all file copies (issue4362)
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'merge remote copy' -d '4 0'
created new head
Make and delete some tags
@ -161,7 +159,6 @@ init broken repository
$ hg up -qC 0
$ echo bc >> b
$ hg ci -m changebagain
created new head
$ HGMERGE=internal:local hg -q merge
$ hg ci -m merge
$ hg mv b d

1
tests/test-convert-svn-sink.t
View File

@ -371,7 +371,6 @@ Branchy history
$ echo right-1 > b/right-1
$ hg --cwd b ci -d '3 0' -Amright-1
adding right-1
created new head
$ svn-safe-append.py right-2 b/b
$ echo right-2 > b/right-2

1
tests/test-convert.t
View File

@ -540,7 +540,6 @@ test revset converted() lookup
$ echo f > c/f
$ hg -R c ci -d'0 0' -Amf
adding f
created new head
$ hg -R c log -r "converted(09d945a62ce6)"
changeset: 1:98c3dd46a874
user: test

7
tests/test-copytrace-heuristics.t
View File

@ -227,7 +227,6 @@ Test the copytrace.movecandidateslimit with many move candidates
$ hg up -q ".^"
$ echo b > a
$ hg ci -m 'mod a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
@ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
@ -274,7 +273,6 @@ Move file in one branch and delete it in another
$ hg up -q ".^"
$ hg rm a
$ hg ci -m 'del a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: 7d61ee3b1e48577891a072024968428ba465c47b
@ -341,7 +339,6 @@ Move file twice and rebase mod on top of moves
$ hg up -q 0
$ echo c > a
$ hg ci -m 'mod a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
@ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3
@ -376,7 +373,6 @@ Move file twice and rebase moves on top of mods
$ hg up -q 0
$ echo c > a
$ hg ci -m 'mod a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
@ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3
| desc: mod a
@ -413,7 +409,6 @@ Move one file and add another file in the same folder in one branch, modify file
$ hg up -q 0
$ echo b > a
$ hg ci -m 'mod a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
@ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
@ -450,7 +445,6 @@ Merge test
$ hg up -q 0
$ hg mv a b
$ hg ci -m 'mv a b'
created new head
$ hg up -q 2
$ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
@ -486,7 +480,6 @@ Copy and move file
$ hg up -q 0
$ echo b > a
$ hg ci -m 'mod a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}\n'
@ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e

1
tests/test-debugindexdot.t
View File

@ -9,7 +9,6 @@ Create a short file history including a merge.
$ hg up -qC 0
$ echo b >> a
$ hg ci -m t3 -d '2 0'
created new head
$ HGMERGE=true hg merge -q
$ hg ci -m merge -d '3 0'

1
tests/test-diff-change.t
View File

@ -103,7 +103,6 @@ Testing diff --change when merge:
$ sed -e 's,^8$,y,' file.txt > file.txt.tmp
$ mv file.txt.tmp file.txt
$ hg commit -m "change 8 to y"
created new head
$ hg up -C -r 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

1
tests/test-diffdir.t
View File

@ -47,7 +47,6 @@ it should not be in the diff.
$ echo 123 > b
$ hg add b
$ hg ci -m "b"
created new head
$ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

2
tests/test-dirstate-race.t
View File

@ -194,7 +194,6 @@ Set up a rebase situation for issue5581.
$ echo c2 > b
$ hg add b
$ hg commit -m c2
created new head
$ echo c3 >> a
$ hg commit -m c3
$ hg update 2
@ -202,7 +201,6 @@ Set up a rebase situation for issue5581.
$ echo c4 >> a
$ echo c4 >> b
$ hg commit -m c4
created new head
Configure a merge tool that runs status in the middle of the rebase. The goal of
the status call is to trigger a potential bug if fsmonitor's state is written

1
tests/test-double-merge.t
View File

@ -16,7 +16,6 @@ the other changes
$ echo line 0 > foo
$ hg cat foo >> foo
$ hg ci -m 'change foo'
created new head
we get conflicts that shouldn't be there
$ hg merge -P

1
tests/test-empty-file.t
View File

@ -13,7 +13,6 @@
$ touch empty3
$ hg add empty3
$ hg commit -m 'add empty3'
created new head
$ hg heads
changeset: 2:a1cb177e0d44

2
tests/test-empty-group.t
View File

@ -31,7 +31,6 @@
$ hg ci -A -m 2
adding x
adding y
created new head
$ hg merge 1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -44,7 +43,6 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -A -m m2
created new head
$ cd ..

1
tests/test-eol-hook.t
View File

@ -109,7 +109,6 @@ Create repo
$ printf "some\nother\nfile" > c.txt
$ hg add c.txt
$ hg commit -m "LF c.txt, b.txt doesn't exist here"
created new head
$ hg push -f ../main
pushing to ../main
searching for changes

2
tests/test-excessive-merge.t
View File

@ -16,7 +16,6 @@
$ echo blah > b
$ hg ci -m "branch b"
created new head
$ HGMERGE=true hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@ -29,7 +28,6 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge a/b -> blah"
created new head
$ hg log
changeset: 4:2ee31f665a86

1
tests/test-exchange-obsmarkers-case-A2.t
View File

@ -59,7 +59,6 @@ initial
$ hg up '.~1'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B
created new head
$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B)'`
$ hg log -G
@ 35b183996678 (draft): B

4
tests/test-exchange-obsmarkers-case-A3.t
View File

@ -68,10 +68,8 @@ initial
$ mkcommit B0
$ hg update -q 0
$ mkcommit A1
created new head
$ hg update -q 0
$ mkcommit B1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
@ -157,10 +155,8 @@ other variant: changeset known in remote
$ hg push -q ../pulldest
$ hg update -q 0
$ mkcommit A1
created new head
$ hg update -q 0
$ mkcommit B1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`

1
tests/test-exchange-obsmarkers-case-A4.t
View File

@ -61,7 +61,6 @@ initial
$ hg update 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit A1
created new head
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets

1
tests/test-exchange-obsmarkers-case-A5.t
View File

@ -62,7 +62,6 @@ initial
$ hg update 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit B1
created new head
$ mkcommit A1
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`

1
tests/test-exchange-obsmarkers-case-A6.t
View File

@ -54,7 +54,6 @@ initial
$ mkcommit A0
$ hg update -q 0
$ mkcommit A1
created new head
make both changeset known in remote

1
tests/test-exchange-obsmarkers-case-B3.t
View File

@ -57,7 +57,6 @@ initial
$ mkcommit A
$ hg up --quiet 0
$ mkcommit B
created new head
$ mkcommit C
$ hg prune -qd '0 0' .
$ hg log -G --hidden

1
tests/test-exchange-obsmarkers-case-B4.t
View File

@ -73,7 +73,6 @@ initial
remote: added 2 changesets with 2 changes to 2 files
$ hg update -q 0
$ mkcommit C
created new head
$ hg prune -qd '0 0' .
$ hg log -G --hidden
x 7f7f229b13a6 (draft): C

1
tests/test-exchange-obsmarkers-case-B5.t
View File

@ -67,7 +67,6 @@ initial
$ mkcommit C
$ hg up --quiet 0
$ mkcommit A1
created new head
$ mkcommit B1
$ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets

1
tests/test-exchange-obsmarkers-case-B6.t
View File

@ -55,7 +55,6 @@ Initial
$ mkcommit B0
$ hg up --quiet 0
$ mkcommit B1
created new head
$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
obsoleted 1 changesets
$ hg prune -qd '0 0' .

1
tests/test-exchange-obsmarkers-case-C2.t
View File

@ -60,7 +60,6 @@ Itinial
$ hg prune -qd '0 0' .
$ hg update -q 0
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets
$ hg log -G --hidden

1
tests/test-exchange-obsmarkers-case-C3.t
View File

@ -62,7 +62,6 @@ Initial
$ hg prune -qd '0 0' .
$ hg update -q 0
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets
$ hg prune -qd '0 0' .

2
tests/test-exchange-obsmarkers-case-C4.t
View File

@ -60,10 +60,8 @@ Implemented as the non-split version
$ mkcommit A
$ hg update -q 0
$ mkcommit B
created new head
$ hg update -q 0
$ mkcommit C
created new head
$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
obsoleted 1 changesets
$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`

1
tests/test-exchange-obsmarkers-case-D1.t
View File

@ -59,7 +59,6 @@ initial
$ mkcommit B
$ hg up -q 0
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets
$ hg prune -d '0 0' 'desc(B)'

1
tests/test-exchange-obsmarkers-case-D2.t
View File

@ -52,7 +52,6 @@ Initial
$ mkcommit A0
$ hg up -q 0
$ mkcommit A1
created new head
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets
$ hg prune --date '0 0' .

1
tests/test-exchange-obsmarkers-case-D3.t
View File

@ -54,7 +54,6 @@ initial
$ mkcommit A0
$ hg up -q 0
$ mkcommit B
created new head
$ mkcommit A1
$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
obsoleted 1 changesets

1
tests/test-exchange-obsmarkers-case-D4.t
View File

@ -56,7 +56,6 @@ initial
$ mkcommit B0
$ hg update -q 0
$ mkcommit A1
created new head
$ mkcommit B1
$ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
obsoleted 1 changesets

2
tests/test-extdiff.t
View File

@ -80,7 +80,6 @@ Test diff during merge:
$ echo c >> c
$ hg add c
$ hg ci -m "new branch" -d '1 0'
created new head
$ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@ -185,7 +184,6 @@ issue4463: usage of command line configuration without additional quoting
$ touch 'sp ace'
$ hg add 'sp ace'
$ hg ci -m 'sp ace'
created new head
$ echo > 'sp ace'
Test pre-72a89cf86fcd backward compatibility with half-baked manual quoting

1
tests/test-fb-hgext-copytrace-errormsg.t
View File

@ -18,7 +18,6 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv 1 2
$ hg ci -m dest
created new head
$ hg rebase -s 1 -d .
rebasing 1:812796267395 "2"
other [source] changed 1 which local [dest] deleted

7
tests/test-fb-hgext-copytrace.t
View File

@ -244,7 +244,6 @@ Move file in one branch and delete it in another
$ hg up -q ".^"
$ hg rm a
$ hg ci -m 'del a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: 7d61ee3b1e48577891a072024968428ba465c47b
@ -292,7 +291,6 @@ Too many move candidates
$ hg up -q ".^"
$ echo b > a
$ hg ci -m 'mod a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
@ -366,7 +364,6 @@ Move file twice and rebase mod on top of moves
$ hg up -q 0
$ echo c > a
$ hg ci -m 'mod a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3
| desc: mod a, phase: draft
@ -403,7 +400,6 @@ Move file twice and rebase moves on top of mods
$ hg up -q 0
$ echo c > a
$ hg ci -m 'mod a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3
| desc: mod a, phase: draft
@ -443,7 +439,6 @@ Move one file and add another file in the same folder in one branch, modify file
$ hg up -q 0
$ echo b > a
$ hg ci -m 'mod a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e
@ -476,7 +471,6 @@ Merge test
$ hg up -q 0
$ hg mv a b
$ hg ci -m 'mv a b'
created new head
$ cd ..
$ hg clone -q server repo
$ initclient repo
@ -519,7 +513,6 @@ Copy and move file
$ hg up -q 0
$ echo b > a
$ hg ci -m 'mod a'
created new head
$ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n'
@ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e

1
tests/test-fb-hgext-dirsync.t
View File

@ -322,7 +322,6 @@ Test that rebasing applies the same change to both
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b > dir1/a
$ hg commit --config extensions.dirsync=! -m "edit dir1/a with sync on"
created new head
$ hg rebase --config extensions.rebase= -d 1
rebasing 2:70b4edc7f658 "edit dir1/a with sync on" (tip)
mirrored changes in 'dir1/a' to 'dir2/a'

3
tests/test-fb-hgext-fastannotate-hg.t
View File

@ -159,7 +159,6 @@ annotate -nlf b
> b5
> EOF
$ hg ci -mb2.1 -d '2 0'
created new head
$ hg merge
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@ -251,7 +250,6 @@ annotate after merge with -l
> a
> EOF
$ hg ci -mc -d '3 0'
created new head
$ hg merge
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@ -691,7 +689,6 @@ create history with a filerev whose linkrev points to another branch
$ echo unrelated > unrelated
$ hg commit -Am 'unrelated'
adding unrelated
created new head
$ hg graft -r 'desc(contentB)'
grafting 1:fd27c222e3e6 "contentB"
$ echo C >> a

1
tests/test-fb-hgext-fastmanifest-access.t
View File

@ -126,7 +126,6 @@ Check diagnosis, debugging information
$ mkcommit d
$ hg update ".^^" -q
$ mkcommit e
created new head
$ mkcommit f
$ hg log -G -r 0:: -T "{rev} {node} {desc|firstline}"
@ 6 dd82c74514cbce45a3c61caf7ffaba16de19cec4 add f

2
tests/test-fb-hgext-fbamend-metaedit.t
View File

@ -68,14 +68,12 @@ We start with a plain base repo::
$ hg up "desc(A)"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit "C"
created new head
$ mkcommit "D"
$ echo "D'" > D
$ hg commit --amend -m "D2"
$ hg up "desc(C)"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit "E"
created new head
$ mkcommit "F"
Test

1
tests/test-fb-hgext-fbamend-next.t
View File

@ -181,7 +181,6 @@ Test --newest flag.
$ touch test
$ hg add test
$ hg commit -m "test"
created new head
$ hg book other
$ showgraph
@ 6 other test

1
tests/test-fb-hgext-fbamend-restack.t
View File

@ -370,7 +370,6 @@ below the current commit alone.
$ hg up 0
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ mkcommit f
created new head
$ hg up 1
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ showgraph

8
tests/test-fb-hgext-fbamend-split.t
View File

@ -71,7 +71,6 @@ Test basic case of splitting a head.
new file mode 100644
examine changes to 'd2'? [Ynesfdaq?] n
created new head
Done splitting? [yN] y
$ showgraph
@ -109,7 +108,6 @@ Split in the middle of a stack.
new file mode 100644
examine changes to 'c2'? [Ynesfdaq?] n
created new head
Done splitting? [yN] y
rebasing 4:* "add d1 and d2" (glob)
rebasing 5:* "add d1 and d2"* (glob)
@ -131,7 +129,6 @@ Split with multiple children and using hash.
$ hg up c20c
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ mkcommit d
created new head
$ hg split c20c << EOF
> y
> y
@ -153,7 +150,6 @@ Split with multiple children and using hash.
new file mode 100644
examine changes to 'a2'? [Ynesfdaq?] n
created new head
Done splitting? [yN] y
rebasing 1:* "add b1 and b2" (glob)
rebasing 6:* "add c1 and c2" (glob)
@ -203,7 +199,6 @@ Split using revset.
new file mode 100644
examine changes to 'b2'? [Ynesfdaq?] n
created new head
Done splitting? [yN] y
rebasing 14:* "add c1 and c2" (glob)
rebasing 15:* "add c1 and c2" (glob)
@ -239,7 +234,6 @@ Test that command aborts when given multiple commits.
Test --no-rebase flag.
$ mkcommit e
created new head
$ hg rebase -s 20 -d .
rebasing 20:* "add c1 and c2" (glob)
rebasing 21:* "add c1 and c2" (glob)
@ -288,7 +282,6 @@ Test --no-rebase flag.
new file mode 100644
examine changes to 'e2'? [Ynesfdaq?] n
created new head
Done splitting? [yN] y
$ showgraph
@ -348,7 +341,6 @@ Test that bookmarks are correctly moved.
new file mode 100644
examine changes to 'a2'? [Ynesfdaq?] n
created new head
Done splitting? [yN] y
$ showgraph

1
tests/test-fb-hgext-fbamend-to.t
View File

@ -24,7 +24,6 @@ Test that amend --to option
$ hg update -r "desc(ROOT)"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit "A"
created new head
$ mkcommit "B"
$ mkcommit "C"
Test

1
tests/test-fb-hgext-fbamend.t
View File

@ -64,7 +64,6 @@ Test basic functions
$ echo x >> x
$ hg commit -Am 'extra commit to test multiple heads'
adding x
created new head
$ hg up 3
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg amend --fixup

1
tests/test-fb-hgext-fbhistedit-graft.t
View File

@ -25,7 +25,6 @@
> hg add $x
> hg commit -m $x
> done
created new head
$ hg tglog
@ 6:1eb7eda15cd7b2222738a7c9b47d1f51349b2bdb:draft 'f'
|

2
tests/test-fb-hgext-fbhistedit-rebase-interactive.t
View File

@ -31,9 +31,7 @@
$ initrepo
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
log before rebase

1
tests/test-fb-hgext-infinitepush-backup-remotefilelog.t
View File

@ -111,7 +111,6 @@ Create a commit which deletes a file. Make sure it is backed up correctly
$ cd ../client
$ hg up -q 0
$ mkcommit filetodelete
created new head
$ hg rm filetodelete
$ hg ci -m 'deleted'
$ hg log -r . -T '{node}\n'

2
tests/test-fb-hgext-infinitepush-backup-status.t
View File

@ -46,7 +46,6 @@ Setup client
$ echo a > file1
$ changeset_time=`expr $now - 13 \* 60`
$ hg commit -d "$commit_time 0" -m "Backed up changeset"
created new head
$ echo a1 > file1
$ changeset_time=`expr $now - 12 \* 60`
$ hg commit -d "$commit_time 0" -m "Backed up changeset 2"
@ -152,7 +151,6 @@ Check smartlog summary with multiple unbacked up changesets
$ echo b2 > file1
$ commit_time=`expr $now - 11 \* 60`
$ hg commit -d "$commit_time 0" -m "Not backed up changeset 2"
created new head
$ hg smartlog -T '{rev}: {desc}\n' --config infinitepushbackup.enablestatus=yes --config infinitepushbackup.autobackup=yes
o 1: Public changeset 2
|

5
tests/test-fb-hgext-infinitepush-backup.t
View File

@ -114,7 +114,6 @@ Create one more head and run `hg pushbackup`. Make sure that only new head is pu
$ hg up 0
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ mkcommit newhead
created new head
$ hg pushbackup
starting backup .* (re)
searching for changes
@ -126,11 +125,9 @@ Create two more heads and backup them
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit newhead1
created new head
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit newhead2
created new head
$ hg pushbackup
starting backup .* (re)
searching for changes
@ -394,10 +391,8 @@ Make sure it wasn't backed up.
Create two heads, set maxheadstobackup to 1, make sure only latest head was backed up
$ hg up -q 0
$ mkcommit headone
created new head
$ hg up -q 0
$ mkcommit headtwo
created new head
$ hg pushbackup --config infinitepushbackup.maxheadstobackup=1
starting backup .* (re)
searching for changes

6
tests/test-fb-hgext-infinitepush-bundlestore.t
View File

@ -95,7 +95,6 @@ Push to non-scratch bookmark
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit newcommit
created new head
$ hg push -r .
pushing to ssh://user@dummy/repo
searching for changes
@ -502,7 +501,6 @@ still in the old bundle
4 files updated, 0 files merged, 2 files removed, 0 files unresolved
(activating bookmark scratch/mybranch)
$ mkcommit newscratchhead
created new head
$ hg push -r . --to scratch/newscratchhead --create
pushing to ssh://user@dummy/repo
searching for changes
@ -543,7 +541,6 @@ multihead push works.
$ hg up null
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit multihead2
created new head
$ hg push -r . --bundle-store
pushing to ssh://user@dummy/repo
searching for changes
@ -563,7 +560,6 @@ Create two new scratch bookmarks
$ hg up 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit scratchfirstpart
created new head
$ hg push -r . --to scratch/firstpart --create
pushing to ssh://user@dummy/repo
searching for changes
@ -572,7 +568,6 @@ Create two new scratch bookmarks
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit scratchsecondpart
created new head
$ hg push -r . --to scratch/secondpart --create
pushing to ssh://user@dummy/repo
searching for changes
@ -602,7 +597,6 @@ Pull two bookmarks from the second client
176993b87e39bd88d66a2cccadabe33f0b346339 (no-eol)
Make two commits to the scratch branch
$ mkcommit testpullbycommithash1
created new head
$ hg log -r '.' -T '{node}\n' > ../testpullbycommithash1
$ mkcommit testpullbycommithash2
$ hg push -r . --to scratch/mybranch --create -q

1
tests/test-fb-hgext-infinitepush-lfs.t
View File

@ -69,7 +69,6 @@ Make pushbackup that contains bundle with 2 heads
$ mkcommit newcommit
$ hg up -q 0
$ mkcommit newcommit2
created new head
$ hg pushbackup
starting backup * (glob)
searching for changes

1
tests/test-fb-hgext-infinitepush-pullback-obsolete.t
View File

@ -36,7 +36,6 @@ Make a commit, than prune a commit, than create a bookmark on top of it.
Do a backup and try to restore. Make sure it doesn't fail
$ hg up -q null
$ mkcommit tobepruned
created new head
$ hg log -r . -T '{node}\n'
edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff
$ hg prune .

1
tests/test-fb-hgext-infinitepush-pullbackup.t
View File

@ -181,7 +181,6 @@ Backup and restore two commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark book/bookmarksbookmarks/somebook)
$ mkcommit secondinbatch
created new head
$ hg pushbackup
starting backup .* (re)
searching for changes

1
tests/test-fb-hgext-infinitepush-remotenames-public.t
View File

@ -53,7 +53,6 @@ Create new client
Create scratch commit and back it up.
$ hg up -q -r 'desc(third)'
$ mkcommit scratch
created new head
$ hg log -r . -T '{node}\n'
ce87a066ebc28045311cd1272f5edc0ed80d5b1c
$ hg log --graph -T '{desc}'

4
tests/test-fb-hgext-infinitepush-remotenames.t
View File

@ -112,7 +112,6 @@ Create one more branch head on the server
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark scratch/serverbook)
$ mkcommit head2
created new head
$ hg log -G
@ changeset: 2:dc4b2ecb723b
| tag: tip
@ -161,7 +160,6 @@ Push from another client, make sure that push doesn't override scratch bookmarks
$ hg up scratch/serverbook
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkcommit newscratch
created new head
$ hg push -r . --to scratch/secondbranch --create
pushing to ssh://user@dummy/repo
searching for changes
@ -188,11 +186,9 @@ Create new bookmark and try to pull it
$ hg push -q -r . --to scratch/branchtoupdateto1 --create
$ hg up -q ".^"
$ mkcommit newcommittoupdate2
created new head
$ hg push -q -r . --to scratch/branchtoupdateto2 --create
$ hg up -q ".^"
$ mkcommit newcommittopull
created new head
$ hg push -q -r . --to scratch/branchtopull --create
$ cd ../client
$ hg up default/scratch/branchtoupdateto1

1
tests/test-fb-hgext-merge-conflictinfo.t
View File

@ -27,7 +27,6 @@
$ echo "Second conflicted version, F1" > F1
$ echo "Second conflicted version, F2" > F2
$ hg commit -m "second version, b"
created new head
$ hg bookmark b
$ hg log -G -T '({rev}) {desc}\nbookmark: {bookmarks}\nfiles: {files}\n\n'
@ (2) second version, b

6
tests/test-fb-hgext-mergedriver.t
View File

@ -27,7 +27,6 @@ basic merge driver: just lists out files and contents, doesn't resolve any files
$ echo cfoo >> foo.txt
$ echo cbar >> bar.txt
$ hg commit -mc
created new head
$ cat >> $HGRCPATH << EOF
> [experimental]
> mergedriver = python:$TESTTMP/mergedriver-list.py
@ -185,7 +184,6 @@ mark a file driver-resolved, and leave others unresolved
R bar.txt
R foo.txt
$ hg commit -m 'merged'
created new head
$ cat foo.txt
abar
cbar
@ -221,7 +219,6 @@ mark a file driver-resolved, and leave others unresolved (but skip merge driver)
$ hg debugmergestate | grep 'merge driver:'
merge driver: python:$TESTTMP/mergedriver-auto1.py (state "s")
$ hg commit -m 'merged'
created new head
leave no files unresolved, but files driver-resolved
(r = False, unresolved = n, driver-resolved = y)
@ -270,7 +267,6 @@ implicitly makes them resolved
$ hg debugmergestate | grep 'merge driver:'
merge driver: python:$TESTTMP/mergedriver-driveronly.py (state "s")
$ hg commit -m 'merged'
created new head
indicate merge driver is necessary at commit
(r = True, unresolved = n, driver-resolved = n)
@ -323,7 +319,6 @@ XXX shouldn't output a warning
ancestor path: foo.txt (node ad59c7ac23656632da079904d4d40d0bab4aeb80)
other path: foo.txt (node 0b0743b512ba9b7c5db411597cf374a73b9f00ac)
$ hg commit -m 'merged'
created new head
make sure this works sensibly when files are unresolved
(r = True, unresolved = y, driver-resolved = n)
@ -593,7 +588,6 @@ verify behavior with different merge driver
ancestor path: foo.txt (node ad59c7ac23656632da079904d4d40d0bab4aeb80)
other path: foo.txt (node 0b0743b512ba9b7c5db411597cf374a73b9f00ac)
$ hg -R repo1 commit -m merged
created new head
this should invoke the merge driver
$ cd repo1

1
tests/test-fb-hgext-perftweaks.t
View File

@ -115,7 +115,6 @@ Test avoiding calculating head changes during commit
$ hg up -q A
$ echo C > C
$ hg commit -m C -A C
created new head
$ hg up -q A
$ echo D > D
$ hg commit -m D -A D --config perftweaks.disableheaddetection=1

1
tests/test-fb-hgext-pushrebase.t
View File

@ -942,7 +942,6 @@ Push an already-public changeset and confirm it is rejected
$ hg update -q '.^'
$ echo 2 > C
$ hg commit -m C -A C
created new head
$ hg phase -r. --public
$ hg push -r . --to default
pushing to $TESTTMP/server2 (glob)

2
tests/test-fb-hgext-rage.t
View File

@ -7,7 +7,7 @@
$ cd repo
#if osx
$ echo "[rage]" >> .hg/hgrc
$ echo "rpmbin = /bin/rpm" >> .hg/hgrc
$ echo "rpmbin = /""bin/rpm" >> .hg/hgrc
#endif
$ hg rage --preview | grep -o 'blackbox'
blackbox

2
tests/test-fb-hgext-remotefilelog-local.t
View File

@ -79,7 +79,6 @@
$ echo xxxx > x
$ echo yyyy > y
$ hg commit -m x
created new head
2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
# restore state for future tests
@ -185,7 +184,6 @@
$ echo merge >> w
$ hg commit -m w
created new head
$ hg merge 2
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

1
tests/test-fb-hgext-scm-prompt-hg.t
View File

@ -43,7 +43,6 @@ Test basic repo behaviors
$ echo bb > b
$ hg add b
$ cmd hg commit -m 'c3'
created new head
(active)
$ hg log -T '{node|short} {desc}\n' -G
@ 4b6cc7d5194b c3

2
tests/test-fb-hgext-smartlog-obsolete.t
View File

@ -55,7 +55,6 @@ Check rebase template keyword.
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[*] Amended (glob)
$ mkcommit c
created new head
$ showgraph
@ 3 add c
|
@ -109,7 +108,6 @@ Check split template keyword.
new file mode 100644
examine changes to 'd2'? [Ynesfdaq?] n
created new head
Done splitting? [yN] y
$ showgraph
@ 8 add d1 and d2

1
tests/test-fb-hgext-smartlog-tweakdefaults.t
View File

@ -32,7 +32,6 @@ Prepare a repo for rebase checks
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo b > b && hg ci -Am b # rev 5
adding b
created new head
$ hg rebase --hidden -r 5 -d 1 # rev 6
rebasing 5:1e9a3c00cbe9 "b" (tip)
$ hg rebase --hidden -r 5 -d 2 # rev 7

19
tests/test-fb-hgext-smartlog.t
View File

@ -32,7 +32,6 @@ Continue repo setup
$ touch b && hg add b && hg ci -mb
$ hg up -q master
$ touch c1 && hg add c1 && hg ci -mc1
created new head
$ touch c2 && hg add c2 && hg ci -mc2
$ hg book feature2
$ touch d && hg add d && hg ci -md
@ -271,7 +270,6 @@ Test with two unrelated histories
0 files updated, 0 files merged, 5 files removed, 0 files unresolved
(leaving bookmark feature2)
$ touch u1 && hg add u1 && hg ci -mu1
created new head
$ touch u2 && hg add u2 && hg ci -mu2
$ hg smartlog -T compact
@ -309,7 +307,6 @@ Test singlepublicsuccessor template keyword
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo c > c && hg ci -Am c
adding c
created new head
$ hg rebase -s 2 -d 1
rebasing 2:d36c0562f908 "c" (tip)
$ hg phase -r 3 --public
@ -480,31 +477,17 @@ Make sure public commits that are descendants of master are not drawn
|
Make sure the template keywords are documented correctly
$ hg help templates | egrep -A2 '(amend|fold|histedit|rebase|singlepublic|split|undo)'successor
$ hg help templates | egrep '(amend|fold|histedit|rebase|singlepublic|split|undo|node.s )'successor
amendsuccessors
Return all of the node's successors created as a result of
amend
--
foldsuccessors
Return all of the node's successors created as a result of
fold
--
histeditsuccessors
Return all of the node's successors created as a result of
histedit
--
rebasesuccessors
Return all of the node's successors created as a result of
rebase
--
singlepublicsuccessor
String. Get a single public successor for a given node. If
there's none or more than one, return empty string. This is
--
splitsuccessors
Return all of the node's successors created as a result of
split
--
undosuccessors
Return all of the node's successors created as a result of
undo

2
tests/test-fb-hgext-treedirstate-race.t
View File

@ -205,7 +205,6 @@ Set up a rebase situation for issue5581.
$ echo c2 > b
$ hg add b
$ hg commit -m c2
created new head
$ echo c3 >> a
$ hg commit -m c3
$ hg update 2
@ -213,7 +212,6 @@ Set up a rebase situation for issue5581.
$ echo c4 >> a
$ echo c4 >> b
$ hg commit -m c4
created new head
Configure a merge tool that runs status in the middle of the rebase. The goal of
the status call is to trigger a potential bug if fsmonitor's state is written

Some files were not shown because too many files have changed in this diff Show More