merge: pass contexts to applyupdates

merge: don't call hooks for revert - don't call hooks for revert - use extra variables to avoid swapping contexts

merge: use contexts for manifestmerge - take ma, backwards, and copy out of update - move findcopies call inside manifestmerge - pass repo rather than ui

commit: unify file-level commit code

fix localrepo.status when dealing with x-bit changes

extend test-flags

merge with upstream

Use filelog.cmp in checkfilemerge

merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index

merge with crew

bundle --base: use the right set for the base

fix bash completion of debug commands; add test for debugcomplete The debugconfig -> showconfig renaming broke things.

[patchbomb] prepend leading zeros in the "[PATCH N of M]" string Without this patch, if one tries to send a patch bomb with more than 9 patches, the resulting subjects are not easily alphabetically sortable. For example: ... [PATCH 9 of 10] [PATCH 10 of 10] This patch prepends as many leading zeros as necessary. E.g., [PATCH 09 of 10] or [PATCH 009 of 100]

merged now fully working base85 codec, though currently unused.

merge with upstream

Fix undetected change bug in rename tests

Handle odd-sized base85 input and output

Put in backslash again, it was needed to disable an asciidoc macro. Backed out changeset c05b0cc6b1485bb240e118a2be9e1d52bb25fd65

Corrected typo in date format, found by Rob Landley.

Make test-bundle-r executable.

add -r/--rev and --base option to bundle --rev is used to specify a target rev (like pull or clone) --base REV is used to specify a base instead of a target repo the target repo is assumed to have all the rev specified in --base

Update test output

Merge with crew

merge: copy fixes and tests Fix up "already seen" logic Fix merge action in remote copy case Add status message Add lots of merge+copy/move test cases

Add a base85 codec

hgweb: fix filerevision raw URL

disallow commands on non local repository

Moved hgweb map-* files into their style directories and adjusted them.

hgweb: Search templates in templatepath/style/map, too, using a common function. This allows for web templates to be self-contained in a directory, which makes copying and modifying them easier.

ssh: make the error message more clear, add a testcase