facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

fbamend: fix typo and shorten advice

Browse Source 
Summary: Shorter and sweeter and hopefully more correct.

Reviewers: #fbhgext, mjpieters

Reviewed By: mjpieters

Subscribers: mjpieters

Differential Revision: https://phab.mercurial-scm.org/D827
This commit is contained in:
Ryan McElroy 2017-09-27 06:43:51 -07:00
parent 65cf7910fc
commit 1ac1a987b3
11 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hgext3rd/fbamend/prune.py
View File

@ -121,8 +121,7 @@ def prune(ui, repo, *revs, **opts):
prune multiple changesets with a single successor, you must pass the
``--fold`` option.
"""
ui.warn(_(
'advice: `hg hide` commnand provides a better UI for hiding commits\n'))
ui.warn(_("advice: 'hg hide' provides a better UI for hiding commits\n"))
revs = scmutil.revrange(repo, list(revs) + opts.get('rev', []))
succs = opts.get('succ', [])
bookmarks = set(opts.get('bookmark', ()))

6
tests/test-cleanobsstore.t
View File

@ -12,14 +12,14 @@
$ hg debugbuilddag +5
$ hg up -q tip
$ hg prune -r .
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory now at 2dc09a01254d
1 changesets pruned
$ hg debugobsolete
bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob)
$ HGUSER=baduser hg prune -r .
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory now at 01241442b3c2
1 changesets pruned
@ -43,7 +43,7 @@ Create bad obsmarker again. Make sure it wasn't cleaned again
$ hg add 1
$ hg ci -q -m 1
$ HGUSER=baduser hg prune -q -r .
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
$ hg debugobsolete
bebd167eb94d257ace0e814aeb98e6972ed2970d 0 {2dc09a01254db841290af0538aa52f6f52c776e3} (*) {'operation': 'prune', 'user': 'test'} (glob)
73bce0eaaf9d039023d1b34421aceab146636d3e 0 {01241442b3c2bf3211e593b549c655ea65b295e3} (*) {'operation': 'prune', 'user': 'baduser'} (glob)

4
tests/test-fastpartialmatch-obsolete.t
View File

@ -21,7 +21,7 @@
$ cd repo
$ mkcommit firstcommit
$ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 000000000000
1 changesets pruned
@ -30,7 +30,7 @@
$ mkcommit first
$ hg debugcheckpartialindex
$ hg prune -q .
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
$ hg debugcheckpartialindex
Try histedit

2
tests/test-fbamend-hiddenoverride.t
View File

@ -44,7 +44,7 @@ Changing working copy parent pins a node
Strip/prune unpins a node
$ hg prune 1 -q
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
$ hg log -G -T '{rev} {desc}\n'
o 2 C
|

10
tests/test-infinitepush-backup.t
View File

@ -31,7 +31,7 @@ Backup empty repo
finished in \d+\.(\d+)? seconds (re)
$ mkcommit commit
$ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 000000000000
1 changesets pruned
@ -88,7 +88,7 @@ Make first commit public (by doing push) and then backup new commit
Create obsoleted commit
$ mkcommit obsoletedcommit
$ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 94a60f5ad8b2
1 changesets pruned
@ -192,7 +192,7 @@ Nothing changed, make sure no backup happens
Obsolete a head, make sure backup happens
$ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 773a3ba2e7c2
1 changesets pruned
@ -367,7 +367,7 @@ Make commit and immediately obsolete it, then create a bookmark.
Make sure pushbackup works
$ mkcommit toobsolete
$ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 630839011471
1 changesets pruned
@ -446,7 +446,7 @@ Prune commit and then inhibit obsmarkers. Make sure isbackedup still works
remote: 6c4f4b30ae4c headtwo
finished in \d+\.(\d+)? seconds (re)
$ hg prune 6c4f4b30ae4c2dd928d551836c70c741ee836650
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 630839011471
1 changesets pruned

4
tests/test-infinitepush-bundlestore.t
View File

@ -423,7 +423,7 @@ Scratch pull of pruned commits
> evolution=createmarkers
> EOF
$ hg prune -r scratch/mybranch
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
1 changesets pruned
$ hg log -r 'reverse(::scratch/mybranch)' -T '{desc}\n'
scratchcommitwithpushrebase
@ -452,7 +452,7 @@ Prune it again and pull it via commit hash
$ hg log -r scratch/mybranch -T '{node}\n'
8872775dd97a750e1533dc1fbbca665644b32547
$ hg prune -r scratch/mybranch
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
1 changesets pruned
$ hg log -G -T '{node|short} {desc} {bookmarks}'
@ fe8283fe1190 peercommit

2
tests/test-infinitepush-pullback-obsolete.t
View File

@ -40,7 +40,7 @@ Do a backup and try to restore. Make sure it doesn't fail
$ hg log -r . -T '{node}\n'
edb281c9cc7e2e51c382b6f254d1967fdfa5e6ff
$ hg prune .
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 000000000000
1 changesets pruned

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

@ -189,7 +189,7 @@ Hidden changesets are not considered as successors
o 0 1ea73414a91b
$ hg prune 2 -q
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
$ hg log -T "{rev} {node|short} {amendsuccessors % '(amend as {short(amendsuccessor)}) '}\n" -G -r 'all()'
x 1 66f7d451a68b
|

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

@ -17,7 +17,7 @@ Test hg bookmark works with hidden commits
$ echo 1 >> a
$ hg commit a -m a1
$ hg prune da7a5140a611 -q
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
$ hg bookmark b -r da7a5140a611 -q
Same test but with remotenames enabled

4
tests/test-tweakdefaults.t
View File

@ -563,7 +563,7 @@ Test that we do not show divergence warning if inhibit is enabled
Test that we allow pure prune rebases
$ hg strip 4
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 1e4be0697311
1 changesets pruned
@ -712,7 +712,7 @@ Test bookmark -D
o 0
$ hg bookmark -D feature1
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
bookmark 'feature1' deleted
2 changesets pruned
$ hg log -G -T '{rev} {bookmarks}' -r 'all()' --hidden

2
tests/test-undo.t
View File

@ -704,7 +704,7 @@ Check local undo with facebook style strip
> fbamend = $TESTDIR/../hgext3rd/fbamend/
> EOF
$ hg strip 3ee6
advice: `hg hide` commnand provides a better UI for hiding commits
advice: 'hg hide' provides a better UI for hiding commits
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 75f63379f12b
1 changesets pruned