##// END OF EJS Templates
extdiff: made it less chatty in non-verbose mode...
Brad Schick -
r5136:841568cc default
parent child Browse files
Show More
@@ -63,9 +63,8 b' def snapshot_node(ui, repo, files, node,'
63 dirname = '%s.%s' % (dirname, short(node))
63 dirname = '%s.%s' % (dirname, short(node))
64 base = os.path.join(tmproot, dirname)
64 base = os.path.join(tmproot, dirname)
65 os.mkdir(base)
65 os.mkdir(base)
66 if not ui.quiet:
66 ui.note(_('making snapshot of %d files from rev %s\n') %
67 ui.write_err(_('making snapshot of %d files from rev %s\n') %
67 (len(files), short(node)))
68 (len(files), short(node)))
69 for fn in files:
68 for fn in files:
70 if not fn in mf:
69 if not fn in mf:
71 # skipping new file after a merge ?
70 # skipping new file after a merge ?
@@ -90,9 +89,8 b' def snapshot_wdir(ui, repo, files, tmpro'
90 dirname = "root"
89 dirname = "root"
91 base = os.path.join(tmproot, dirname)
90 base = os.path.join(tmproot, dirname)
92 os.mkdir(base)
91 os.mkdir(base)
93 if not ui.quiet:
92 ui.note(_('making snapshot of %d files from working dir\n') %
94 ui.write_err(_('making snapshot of %d files from working dir\n') %
93 (len(files)))
95 (len(files)))
96 for fn in files:
94 for fn in files:
97 wfn = util.pconvert(fn)
95 wfn = util.pconvert(fn)
98 ui.note(' %s\n' % wfn)
96 ui.note(' %s\n' % wfn)
@@ -1,9 +1,5 b''
1 adding a
1 adding a
2 making snapshot of 0 files from rev 000000000000
3 making snapshot of 1 files from working dir
4 Only in a: a
2 Only in a: a
5 making snapshot of 0 files from rev 000000000000
6 making snapshot of 1 files from working dir
7 diffing a.000000000000 a
3 diffing a.000000000000 a
8 hg falabala [OPTION]... [FILE]...
4 hg falabala [OPTION]... [FILE]...
9
5
@@ -26,14 +22,10 b' options:'
26 -X --exclude exclude names matching the given patterns
22 -X --exclude exclude names matching the given patterns
27
23
28 use "hg -v help falabala" to show global options
24 use "hg -v help falabala" to show global options
29 making snapshot of 1 files from rev e27a2475d60a
30 making snapshot of 1 files from rev 5e49ec8d3f05
31 diffing a.e27a2475d60a a.5e49ec8d3f05
25 diffing a.e27a2475d60a a.5e49ec8d3f05
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
27 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
35 (branch merge, don't forget to commit)
29 (branch merge, don't forget to commit)
36 making snapshot of 1 files from rev 5e49ec8d3f05
37 making snapshot of 1 files from working dir
38 diffing a.5e49ec8d3f05 a
30 diffing a.5e49ec8d3f05 a
39 diff-like tools yield a non-zero exit code
31 diff-like tools yield a non-zero exit code
General Comments 0
You need to be logged in to leave comments. Login now