##// END OF EJS Templates
histedit: allow "-" as a command file...
Pierre-Yves David -
r19018:730614b9 default
parent child Browse files
Show More
@@ -143,6 +143,7 b' try:'
143 except ImportError:
143 except ImportError:
144 import pickle
144 import pickle
145 import os
145 import os
146 import sys
146
147
147 from mercurial import cmdutil
148 from mercurial import cmdutil
148 from mercurial import discovery
149 from mercurial import discovery
@@ -515,7 +516,10 b' def histedit(ui, repo, *parent, **opts):'
515 f.write(rules)
516 f.write(rules)
516 f.close()
517 f.close()
517 else:
518 else:
518 f = open(rules)
519 if rules == '-':
520 f = sys.stdin
521 else:
522 f = open(rules)
519 rules = f.read()
523 rules = f.read()
520 f.close()
524 f.close()
521 rules = [l for l in (r.strip() for r in rules.splitlines())
525 rules = [l for l in (r.strip() for r in rules.splitlines())
@@ -49,14 +49,12 b' log before edit'
49 o 0:cb9a9f314b8b a
49 o 0:cb9a9f314b8b a
50
50
51
51
52 $ EDITED="$TESTTMP/editedhistory"
52 $ hg histedit 177f92b77385 --commands - 2>&1 <<EOF | fixbundle
53 $ cat > $EDITED <<EOF
54 > pick e860deea161a e
53 > pick e860deea161a e
55 > pick 652413bf663e f
54 > pick 652413bf663e f
56 > fold 177f92b77385 c
55 > fold 177f92b77385 c
57 > pick 055a42cdd887 d
56 > pick 055a42cdd887 d
58 > EOF
57 > EOF
59 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
60 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
58 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
61 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
59 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
62 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
60 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -67,9 +65,9 b' log before edit'
67
65
68 log after edit
66 log after edit
69 $ hg logt --graph
67 $ hg logt --graph
70 @ 4:7e0a290363ed d
68 @ 4:9c277da72c9b d
71 |
69 |
72 o 3:5e24935bad3d pick e860deea161a e
70 o 3:6de59d13424a f
73 |
71 |
74 o 2:ee283cb5f2d5 e
72 o 2:ee283cb5f2d5 e
75 |
73 |
@@ -138,6 +136,7 b' folded content is dropped during a merge'
138 o 0:0189ba417d34 1+2+3
136 o 0:0189ba417d34 1+2+3
139
137
140
138
139 $ EDITED="$TESTTMP/editedhistory"
141 $ cat > $EDITED <<EOF
140 $ cat > $EDITED <<EOF
142 > pick 617f94f13c0f 1 +4
141 > pick 617f94f13c0f 1 +4
143 > drop 888f9082bf99 2 +5
142 > drop 888f9082bf99 2 +5
General Comments 0
You need to be logged in to leave comments. Login now