diff options
| author | Dan Buch <daniel.buch@gmail.com> | 2010-05-06 15:01:13 -0400 |
|---|---|---|
| committer | Dan Buch <daniel.buch@gmail.com> | 2010-05-06 15:01:13 -0400 |
| commit | 2f1e0bc5d58839f32c9520e09e1b3e2915becfe1 (patch) | |
| tree | c53b6bfa61b5afc318092ca93f8418a4892f859b | |
| parent | aaa903d06a8adbc326bb0d750f304761d20dbaa1 (diff) | |
| parent | cf21db0d8b5f966f0f1f1508bbb83e28f3134284 (diff) | |
| download | hg_sshsign-2f1e0bc5d58839f32c9520e09e1b3e2915becfe1.tar.bz2 hg_sshsign-2f1e0bc5d58839f32c9520e09e1b3e2915becfe1.tar.xz hg_sshsign-2f1e0bc5d58839f32c9520e09e1b3e2915becfe1.zip | |
merging from mcrute
| -rw-r--r-- | hgsshsign/__init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hgsshsign/__init__.py b/hgsshsign/__init__.py index bd612df..0c62b1a 100644 --- a/hgsshsign/__init__.py +++ b/hgsshsign/__init__.py | |||
| @@ -130,17 +130,17 @@ def sign(ui, repo, *revs, **opts): | |||
| 130 | repo.opener("localsigs", "ab").write(sigmessage) | 130 | repo.opener("localsigs", "ab").write(sigmessage) |
| 131 | return | 131 | return |
| 132 | 132 | ||
| 133 | msigs = match.exact(repo.root, '', ['.hgsigs']) | 133 | msigs = match.exact(repo.root, '', ['.hgsshsigs']) |
| 134 | s = repo.status(match=msigs, unknown=True, ignored=True)[:6] | 134 | s = repo.status(match=msigs, unknown=True, ignored=True)[:6] |
| 135 | if util.any(s) and not opts["force"]: | 135 | if util.any(s) and not opts["force"]: |
| 136 | raise util.Abort(_("working copy of .hgsigs is changed " | 136 | raise util.Abort(_("working copy of .hgsshsigs is changed " |
| 137 | "(please commit .hgsigs manually " | 137 | "(please commit .hgsshsigs manually " |
| 138 | "or use --force)")) | 138 | "or use --force)")) |
| 139 | 139 | ||
| 140 | repo.wfile(".hgsigs", "ab").write(sigmessage) | 140 | repo.wfile(".hgsshsigs", "ab").write(sigmessage) |
| 141 | 141 | ||
| 142 | if '.hgsigs' not in repo.dirstate: | 142 | if '.hgsshsigs' not in repo.dirstate: |
| 143 | repo.add([".hgsigs"]) | 143 | repo.add([".hgsshsigs"]) |
| 144 | 144 | ||
| 145 | if opts["no_commit"]: | 145 | if opts["no_commit"]: |
| 146 | return | 146 | return |