Mercurial > hg
annotate tests/dummyssh @ 23362:cc83cac41619
merge: remove confusing comment about --force
manifestmerge() has a piece of code that's roughly:
if not force and different:
abort
else:
# if different: old untracked f may be overwritten and lost
...
The comment only talks about what happens when 'different' is true,
and in combination with the if-block above, that must mean that it is
only about what happens when 'force and different'. It seems quite
fine that files are overwritten when 'force' is true, so let's remove
the comment. As it stands, it can easily be interpreted as a TODO
(which is how I interpreted it at first).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 19 Nov 2014 08:50:08 -0800 |
parents | f266cb3f1c2b |
children | 26d4ce8ca2bd |
rev | line source |
---|---|
14186 | 1 #!/usr/bin/env python |
2 | |
3 import sys | |
4 import os | |
5 | |
6 os.chdir(os.getenv('TESTTMP')) | |
7 | |
8 if sys.argv[1] != "user@dummy": | |
9 sys.exit(-1) | |
10 | |
11 os.environ["SSH_CLIENT"] = "127.0.0.1 1 2" | |
12 | |
13 log = open("dummylog", "ab") | |
14 log.write("Got arguments") | |
15 for i, arg in enumerate(sys.argv[1:]): | |
19320
f266cb3f1c2b
dummyssh: fix check-code nit
Augie Fackler <raf@durin42.com>
parents:
15768
diff
changeset
|
16 log.write(" %d:%s" % (i + 1, arg)) |
14186 | 17 log.write("\n") |
18 log.close() | |
15768
cdf9c43445df
tests: make simple single quotes work with dummyssh on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
19 hgcmd = sys.argv[2] |
cdf9c43445df
tests: make simple single quotes work with dummyssh on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
20 if os.name == 'nt': |
cdf9c43445df
tests: make simple single quotes work with dummyssh on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
21 # hack to make simple unix single quote quoting work on windows |
cdf9c43445df
tests: make simple single quotes work with dummyssh on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
22 hgcmd = hgcmd.replace("'", '"') |
cdf9c43445df
tests: make simple single quotes work with dummyssh on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
23 r = os.system(hgcmd) |
14186 | 24 sys.exit(bool(r)) |