Skip to content

Commit ba81ff8

Browse files
zzl0facebook-github-bot
authored andcommitted
morestatus: improve the update clean message
Summary: The `.` in the previous update-clean message is easy to overlook. Before: ``` # To abort: sl goto --clean . (warning: this will discard uncommitted changes) ``` After: ``` # To abort: sl goto . --clean (warning: this will discard uncommitted changes) ``` Differential Revision: D83192333 fbshipit-source-id: 708347e4bb4e2d7019268fe8a89bd51ff8f175c5
1 parent fa90e2c commit ba81ff8

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

eden/scm/sapling/ext/morestatus.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def rebasemsg(repo, ui):
101101

102102
def updatecleanmsg(dest=None):
103103
warning = _("warning: this will discard uncommitted changes")
104-
return _("@prog@ goto --clean %s (%s)") % (dest or ".", warning)
104+
return _("@prog@ goto %s --clean (%s)") % (dest or ".", warning)
105105

106106

107107
def updatemsg(repo, ui):

eden/scm/tests/test-conflict.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
#
6767
# To mark files as resolved: hg resolve --mark FILE
6868
# To continue: hg commit
69-
# To abort: hg goto --clean . (warning: this will discard uncommitted changes)
69+
# To abort: hg goto . --clean (warning: this will discard uncommitted changes)
7070

7171
$ cat a
7272
Small Mathematical Series.

eden/scm/tests/test-dotgit-goto.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ tofix: should have a way to get out of the unfinished *update* state
5555

5656
# The repository is in an unfinished *update* state.
5757
# To continue: sl go 'desc(B)'
58-
# To abort: sl goto --clean . (warning: this will discard uncommitted changes)
58+
# To abort: sl goto . --clean (warning: this will discard uncommitted changes)
5959
$ sl shelve
6060
abort: interrupted goto
6161
(use 'sl goto --continue' to continue or

eden/scm/tests/test-morestatus.t

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ Test conflicted merge state
214214
#
215215
# To mark files as resolved: hg resolve --mark FILE
216216
# To continue: hg commit
217-
# To abort: hg goto --clean . (warning: this will discard uncommitted changes)
217+
# To abort: hg goto . --clean (warning: this will discard uncommitted changes)
218218

219219

220220
Test if listed files have a relative path to current location
@@ -231,7 +231,7 @@ Test if listed files have a relative path to current location
231231
#
232232
# To mark files as resolved: hg resolve --mark FILE
233233
# To continue: hg commit
234-
# To abort: hg goto --clean . (warning: this will discard uncommitted changes)
234+
# To abort: hg goto . --clean (warning: this will discard uncommitted changes)
235235

236236
$ cd ../..
237237

@@ -252,7 +252,7 @@ Test non-conflicted merge state
252252

253253
# The repository is in an unfinished *merge* state.
254254
# To continue: hg commit
255-
# To abort: hg goto --clean . (warning: this will discard uncommitted changes)
255+
# To abort: hg goto . --clean (warning: this will discard uncommitted changes)
256256

257257

258258
Test hg status is normal after merge commit (no output)
@@ -266,7 +266,7 @@ Test interrupted update state, without active bookmark and REV is a hash
266266

267267
# The repository is in an unfinished *update* state.
268268
# To continue: hg goto -C 2977a57ce863
269-
# To abort: hg goto --clean . (warning: this will discard uncommitted changes)
269+
# To abort: hg goto . --clean (warning: this will discard uncommitted changes)
270270

271271

272272
Test interrupted update state, with active bookmark and REV is a bookmark
@@ -277,7 +277,7 @@ Test interrupted update state, with active bookmark and REV is a bookmark
277277

278278
# The repository is in an unfinished *update* state.
279279
# To continue: hg goto b2
280-
# To abort: hg goto --clean b1 (warning: this will discard uncommitted changes)
280+
# To abort: hg goto b1 --clean (warning: this will discard uncommitted changes)
281281

282282

283283
Test update state can be reset using bookmark
@@ -293,7 +293,7 @@ Test interrupted update state, without active bookmark and REV is specified usin
293293

294294
# The repository is in an unfinished *update* state.
295295
# To continue: hg goto --date 1970-1-1 -q
296-
# To abort: hg goto --clean . (warning: this will discard uncommitted changes)
296+
# To abort: hg goto . --clean (warning: this will discard uncommitted changes)
297297

298298

299299
$ unbreakupdate
@@ -310,7 +310,7 @@ Test args escaping in continue command
310310

311311
# The repository is in an unfinished *update* state.
312312
# To continue: hg --config 'extensions.fsmonitor=!' --config 'ui.ssh=ssh -oControlMaster=no' update -C 2977a57ce863
313-
# To abort: hg goto --clean b1 (warning: this will discard uncommitted changes)
313+
# To abort: hg goto b1 --clean (warning: this will discard uncommitted changes)
314314

315315

316316
$ unbreakupdate

eden/scm/tests/test-update-merge-state.t

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Python utility:
6262
#
6363
# To mark files as resolved: hg resolve --mark FILE
6464
# To continue: hg goto --continue
65-
# To abort: hg goto --clean . (warning: this will discard uncommitted changes)
65+
# To abort: hg goto . --clean (warning: this will discard uncommitted changes)
6666

6767
# Cannot --continue right now
6868

@@ -83,7 +83,7 @@ Python utility:
8383
# The repository is in an unfinished *update* state.
8484
# No unresolved merge conflicts.
8585
# To continue: hg goto --continue
86-
# To abort: hg goto --clean . (warning: this will discard uncommitted changes)
86+
# To abort: hg goto . --clean (warning: this will discard uncommitted changes)
8787

8888
# To get rid of the state
8989

@@ -135,7 +135,7 @@ Python utility:
135135
# The repository is in an unfinished *merge* state.
136136
# No unresolved merge conflicts.
137137
# To continue: hg continue, then hg commit
138-
# To abort: hg goto --clean . (warning: this will discard uncommitted changes)
138+
# To abort: hg goto . --clean (warning: this will discard uncommitted changes)
139139

140140
# The state is confusing, but 'hg continue' can resolve it.
141141

0 commit comments

Comments
 (0)