##// END OF EJS Templates
histedit: handle multiple spaces between action and hash (issue3893)...
Pierre-Yves David -
r19039:41669a18 default
parent child Browse files
Show More
@@ -722,10 +722,7 b' def verifyrules(rules, repo, ctxs):'
722 if ' ' not in r:
722 if ' ' not in r:
723 raise util.Abort(_('malformed line "%s"') % r)
723 raise util.Abort(_('malformed line "%s"') % r)
724 action, rest = r.split(' ', 1)
724 action, rest = r.split(' ', 1)
725 if ' ' in rest.strip():
725 ha = rest.strip().split(' ', 1)[0]
726 ha, rest = rest.split(' ', 1)
727 else:
728 ha = r.strip()
729 try:
726 try:
730 if repo[ha] not in ctxs:
727 if repo[ha] not in ctxs:
731 raise util.Abort(
728 raise util.Abort(
@@ -68,3 +68,34 b' Run on a revision not ancestors of the c'
68 $ hg histedit -r 4
68 $ hg histedit -r 4
69 abort: 08d98a8350f3 is not an ancestor of working directory
69 abort: 08d98a8350f3 is not an ancestor of working directory
70 [255]
70 [255]
71 $ hg up --quiet
72
73 Test short version of command
74 ---------------------------------------
75
76 Note: we use varying amounts of white space between command name and changeset
77 short hash. This tests issue3893.
78
79 $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
80 > pick eb57da33312f 2 three
81 > p c8e68270e35a 3 four
82 > f 08d98a8350f3 4 five
83 > EOF
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
85 reverting alpha
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
87 four
88 ***
89 five
90
91
92
93 HG: Enter commit message. Lines beginning with 'HG:' are removed.
94 HG: Leave message empty to abort commit.
95 HG: --
96 HG: user: test
97 HG: branch 'default'
98 HG: changed alpha
99 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
100 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
101 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob)
General Comments 0
You need to be logged in to leave comments. Login now