patch: restore the previous output of 'diff --stat' Restore the previous diffstat behaviour of scaling by the maximum number of changes to a single file. Changeset f03f08240c32 modified the diffstat to be scaled by the total number of changes. This seems to have been unintentional.

wireproto: enable optional args for known() for future extensibility Firstly, I think we should do this for all new wire commands, just to be on the safe side. So I want to get this into the 1.9 release. Secondly, there actually is potential here that sometimes the server can know that the number of its nodes which can possibly still be undecided on the client is small. It might then just send them along directly (cutting short the end game). This, however, requires walking the graph on the server, which can be expensive, so for the moment we're not actually doing it.

context: make forget work like commands.forget Switch users of wctx.delete(..., False) to forget.

dirstate: rename forget to drop It has substantially different semantics from forget at the command layer, so change it to avoid confusion. We can't simply combine it with remove because we need to explicitly drop non-added files in some cases like commit.

minirst: read test input from stdin

tests: update monotone version requirement

test-git-import: test patching existing copy targets

httprepo: handle large lengths by bypassing the len() operator

workingctx.remove: don't stat files again after unlinking we already know at this point that they have been unlinked

httprepo: send URL redirection notices to stderr (issue2828)

record: alias qrecord to qnew -i/--interactive

record: add qrefresh -i/--interactive interactively select changes to refresh

record: add an option to backup all wc modifications Also, don't create a backup dir if we have no files to backup. This is essential for qrefresh --interactive. Since we can't select individual files to qrefresh without eliminating already present changes, we have to backup all changes in the working copy to avoid refreshing unaccepted hunks. (thanks to Patrick for the idea)

record: check patch name is valid before prompting in qrecord

mq: use checkpatchname This also fixes a bug where qrename would allow renaming a patch to a reserved name.

mq: wrap patch file name checks in a function

pure parsers: properly detect corrupt index files This new Python code should be equivalent in behavior to the if statement at line 312 of parsers.c. Without this, the pure-python parsers improperly ignore truncated revlogs as created in test-verify.t.

workingctx: unlink paths while holding the wlock

wireproto: do not hash when heads == ['force'] Changeset 88f0e41d8802 introduced the unbundlehash capability and unconditionally hashed the heads on the client side. By mistake, the heads were also cased in the heads == ['force'] case.

patch: remove EOL support from linereader class This was only used when reading patched files which is now done by backends.

subrepo: handle local added subrepo case correctly

graphlog: remove unused arg from _wrapcmd

extensions: raise when trying to find an extension that failed to load extensions that depend on other extensions (such as record) use this pattern to check if the dependant extension is available: try: mq = extensions.find('mq') except KeyError: return but since if an error occurs while loading an extension it leaves its entry in the _extensions map as None, we want to raise in that situation too. (rather than adding another check if the return value is None)

remove: clarify help text about added files never being deleted from disk

pure: provide more correct implementation of posixfile for Windows requires ctypes Why is posixfile a class? Because the implementation needs to use the Python library call os.fdopen [1], which sets the 'name' attribute on the Python file object it creates to the mostly meaningless string '<fdopen>', since file descriptors don't have a name. But users of posixfile depend on the name attribute [2] being set to a proper value, like Python's built-in 'open' function sets it on file objects. Python file's name attribute is read-only, so we can't just assign to it after the file object has alrady been created. To solve this problem, we save the name of the file on a wrapper object, and delegate the file function calls to the wrapped (private) file object using __getattr__. [1] http://docs.python.org/library/os.html#os.fdopen [2] http://docs.python.org/library/stdtypes.html#file.name

bundlerepo: make getremotechanges support filtering of incoming Extensions can hook discovery.findcommonincoming to filter out unwanted remote changesets. This patch makes getremotechanges respect the changed remote heads returned by such extensions.

tests: add tests for discovery/pull without cgsubset

tests: add tests for partial pulls with treediscovery

tests: support multiple caps in notcapable

record: use cmdutil.command decorator

record: suggest the right command when running non interactively

applyupdates: audit merged files protects changing flags on merged files (util.setflags call on line 341)

applyupdates: audit path on flag changes we're using the auditor of the repo wopener, since this is a path that belongs to the tree we're updating to

opener: add audit function

templatekw: use diffstatsum in diffstat keyword

patch: use diffstatsum in diffstat

patch: add diffstatsum helper

diffstatdata: no longer a generator This produces a smallish amount of data and all consumers needed to buffer it anyway.

add new option --all to manifest command prints a list of all files in all revisions of the repo obsoletes the cifiles extension

applyupdates: audit unlinking of renamed files and directories

patchbomb: pass --git argument to diffstat

mq: strip all leading slashes from url when importing When trying to import a url that ends with a slash os.path.basename() would return an empty string. So when seeing a leading slash, remove it and infer the patch name from the remaining url. e.g. `hg qimport http://paste.pocoo.org/raw/xxx/` deduced '.' to be the patch name. Now we'll deduce 'xxx'.

mq: check patch name is valid before reading imported file

tests: update monotone output for v1.0 changes

revlog: stop exporting node.short

patch: fast-path git case in selectfile() We avoid a lot of complicated heuristics in git cases, where these heurestics may even be broken when copies are involved.

patch: unify backend file access interface - Rename readlines() into getfile(), return data and mode - Make setfile() write a data buffer instead of lines, make mode mandatory.

patch: merge backend setmode() into writelines() Copy handling will be easier to handle in a single method.

patch: stop modifying gitpatch objects gitpatch objects emitted by iterhunks() were referencing file paths unmodified from the input patch. _applydif() made them usable by modifying the gitpatch objects in-place with specified path strip level. The same modified objects were then reused by iterhunks() generator. _applydiff() now copies and update the paths which completely decouples both routines. As a side effect, the "git" event now receives only metadata about copies/renames to perform the necessary copies ahead of time. Other actions are handled in the "file" event.

patch: stop handling hunkless git blocks out of stream Patch changes are emitted by iterhunks() in two separate events: 'file' when hunks have to be applied and 'git' to describe other modifications like copies or mode changes. Note that a file which mode is changed and which content is modified by the same patch will be emitted in both events. It is more convenient to handle all file modifications in a single event. This patch "zips" git actions with regular changes so both kinds can be emitted at the same place.

patch: reindent code

patch: unify iterhunks() afile/bfile handling git afile/bfile are extracted twice, once when reading a 'diff --git', and again when reading a unified hunk. The problem is not all git blocks have unified hunks (renames just have metadata) and they were not extracted the same way. This is what this patch unifies.

patch: git metadata was ignored if strip > 1 gitpatch objects emitted by iterhunks() are modified in place by applydiff(). Processing them earlier improves iterhunks() isolation. applydiff() modifying them should still be fixed though.

patch: construct and parse binary hunks at the same time

patch: refactor iterhunks() regular and binary files emission

patch: remove patch.patch() cwd argument

patch: merge _updatedir() into externalpatch()

merge with stable

changelog: convert user and desc from local encoding early Failing to do so makes it impossible to use the memctx API to create a changeset with a commit message or username outside of the current encoding.encoding setting.

merge crew with main