--- a/hgext/fix.py Fri Jan 27 17:30:51 2023 +0100
+++ b/hgext/fix.py Fri Feb 17 17:04:41 2023 +0100
@@ -698,6 +698,9 @@
command = fixer.command(ui, path, ranges)
if command is None:
continue
+ msg = b'fixing: %s - %s - %s\n'
+ msg %= (fixctx, fixername, path)
+ ui.debug(msg)
ui.debug(b'subprocess: %s\n' % (command,))
proc = subprocess.Popen(
procutil.tonativestr(command),
--- a/mercurial/commands.py Fri Jan 27 17:30:51 2023 +0100
+++ b/mercurial/commands.py Fri Feb 17 17:04:41 2023 +0100
@@ -7500,6 +7500,9 @@
)
node = logcmdutil.revsingle(repo, rev_).node()
+ if node is None:
+ raise error.InputError(_(b"cannot tag working directory"))
+
if not message:
# we don't translate commit messages
message = b'Added tag %s for changeset %s' % (
--- a/mercurial/hgweb/server.py Fri Jan 27 17:30:51 2023 +0100
+++ b/mercurial/hgweb/server.py Fri Feb 17 17:04:41 2023 +0100
@@ -206,7 +206,7 @@
env['SERVER_PROTOCOL'] = self.request_version
env['wsgi.version'] = (1, 0)
env['wsgi.url_scheme'] = pycompat.sysstr(self.url_scheme)
- if env.get('HTTP_EXPECT', b'').lower() == b'100-continue':
+ if env.get('HTTP_EXPECT', '').lower() == '100-continue':
self.rfile = common.continuereader(self.rfile, self.wfile.write)
env['wsgi.input'] = self.rfile
--- a/tests/test-fix.t Fri Jan 27 17:30:51 2023 +0100
+++ b/tests/test-fix.t Fri Feb 17 17:04:41 2023 +0100
@@ -1153,6 +1153,7 @@
$ hg commit -Aqm "foo"
$ printf "Foo\nbar\nBaz\n" > foo.changed
$ hg --debug fix --working-dir
+ fixing: f65cf3136d41+ - uppercase-changed-lines - foo.changed
subprocess: * $TESTTMP/uppercase.py 1-1 3-3 (glob)
$ cd ..
--- a/tests/test-remotefilelog-local.t Fri Jan 27 17:30:51 2023 +0100
+++ b/tests/test-remotefilelog-local.t Fri Feb 17 17:04:41 2023 +0100
@@ -77,6 +77,11 @@
n 644 2 * z (glob)
$ echo xxxx > x
$ echo yyyy > y
+# run status early to avoid a flaky second fetch during commit.
+ $ hg st
+ M x
+ M y
+ \d+ files fetched over \d+ fetches .* (re) (?)
$ hg commit -m x
created new head
2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
@@ -104,6 +109,9 @@
new changesets fed61014d323
(run 'hg heads' to see heads, 'hg merge' to merge)
+# run status early to avoid a flaky second fetch during commit
+ $ hg status
+ \d+ files fetched over \d+ fetches .* (re) (?)
$ hg rebase -d tip
rebasing 1:9abfe7bca547 "a"
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/9abfe7bca547-8b11e5ff-rebase.hg (glob)
--- a/tests/test-tag.t Fri Jan 27 17:30:51 2023 +0100
+++ b/tests/test-tag.t Fri Feb 17 17:04:41 2023 +0100
@@ -412,6 +412,10 @@
abort: cannot tag null revision
[10]
+ $ hg tag -R empty -r "wdir()" -f wdirtag
+ abort: cannot tag working directory
+ [10]
+
issue5539: pruned tags do not appear in .hgtags
$ cat >> $HGRCPATH << EOF