merge: if filemerge skips merge, report as updated

Catch python2.3's IndexError with bogus http proxy settings. (issue203)

Fixed contrib/hgdiff script to pass diffopts in the new format.

document the diffstat option of the notify extension

hgweb: add diff links in gitweb file revision page

hgweb: add changeset description to file revision page

hgweb: really fix parent/child rename links

hgweb: better file rename links

hgweb: fix parent/child links across renames

hgweb: add changeset description to annotate page

make revlog.addgroup pass its file handles to addrevision This should fix issue255. It looks like the problem there happens when addgroup calls addrevision to add a full revision, and addrevision decides to split the index file into a .i/.d pair. Since addgroup has an open file handle for the index file, the renaming of the new .i file to its final name fails on windows.

Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)

merge with upstream

use short hashes with diff -v

Use manifest rev instead of changelog rev for linear manifest test

Removed unused imports of mdiff and templater from ui.py

log --copies: use manifest.find instead of delta when manifest parent is not rev-1 This fixes issue391.

Test case for log --copies on non-linear manifests (issue391)

hgweb: fix path cleaning

Merge with asak

portability fix for test-ssh The __del__ method of sshrepo reads the stderr of the remote process until EOF and prints it. If an exception is raised, this method ends up being called: - on Linux: after the "abort: ..." message is printed - on OS X: before the "abort: ..." message is printed This patch explicitly flushes the stderr of the remote process before raising a RepoError.

Merge with mpm

Add popen2 demandload to patch.py, required by diffstat

rawcommit: add removed files to the changelog file list patch by tonfa.

Update test-mq-qdelete to use qdel -r

mq: make qdelete without -k or a subrepository delete all patches

Use line length field when extracting git binary patches

mq: change qdel --forget to --rev; accept any revision symbol

merge: update dirstate correctly for non-branchmerge updates - we don't actually need the context in recordupdates - use -1 for filesize to force check on normal update - only record copy for branchmerges - forget moved files on update

merge: turn followcopies on by default

mq.el: add mode-line hook

python2.5 PyArg_ParseTuple fix Python 2.5 doesn't like it when we mix str objects and the "t#" format in PyArg_ParseTuple. Change it to use "s#". Tested with python 2.3, 2.4 and 2.5.

Add test for git binary diff support

Add git-1.4 binary patch support

gitweb: Fixed parent/child links when viewing a file revision.

Keep session variables when linking from hgwebdir's index to repositories.

Fixed typo in gitweb templates.

hgweb: Apply the new method of passing session variables to links.

hgweb: Keep session variables (currently only style) in HTML forms, too. Adjusted default and gitweb template for this.

templater: Better exception for errors in foo%bar formatting.

nodesbetween: fix a bug with duplicate heads

hgweb: trap lookup errors

Add better error message for bad commands

gitweb: Add error text to error page

gitweb: fix link on file name in filenodelink

gitweb: fix last change field in summary

Merge with main

gitweb: add file diff view

Merge with crew

merge with crew

update ui.quiet/verbose/debug/interactive every time the config changes - ui.quiet/verbose/debug/interactive become just a cache of the ui.cdata settings - the quiet, verbose, debug and interactive options from the [ui] section from .hg/hgrc files are respected for commands that open the repo - setting ui.quiet/verbose/debug/interactive with --config works - the command line options always override the hgrc settings - previously it wasn't possible to override a [ui] debug = True. --debug still takes precedence over --quiet and --verbose.

ui.py: untangle updateopts The code in ui.updateopts that handles ui.quiet, ui.verbose and ui.debugflag is too smart, making it somewhat hard to see what are the exact constraints placed on the values of these variables, hiding some buglets. This patch makes these constraints more explicit, fixing these buglets and changing the behaviour slightly. It also adds a test to make sure things work as expected in the future. The buglets: - setting ui.debug = True in a hgrc wouldn't turn on verbose mode - additionally, setting ui.quiet = True or using --quiet would give you a "quiet debug" mode. The behaviour change: - previously, in a hgrc file, ui.quiet wins against ui.verbose (i.e. the final result would be quiet mode), but --verbose wins against --quiet - now ui.quiet nullifies ui.verbose and --verbose nullifies --quiet. As a consequence, using -qv always gives you normal mode (unless debug mode was turned on somewhere)

call ui.updateopts only after changing directories This corrects --config paths.foo=bar when it's used with --cwd

ui.py: normalize settings every time the configuration changes Previously, we would normalize settings (e.g. turn relative paths into absolute ones) only after reading a config file. Now "--config paths.foo=bar" will use the cwd to make "bar" an absolute path.

move the parsing of --config options to commands.py

ui.py: use the overlay to hold --config data This allows the ui class to know that these items have a higher priority without further help from commands.py.

ui.py: change the overlay from a dict to a SafeConfigParser. This also fixes what's probably a bug - configitems was ignoring the overlay.

ui.py: don't query parentui.cdata when looking up config items. We copied the contents of parentui.cdata on initialization.

ui.py: make walkconfig use configitems Also make it sort the available config sections while we're at it.

ui.py: move common code out of config and configbool

ui.py: remove revlogopts and (unused) diffcache variables This should make the [revlog] section in a .hg/hgrc file be respected when there's still no changelog.

ui.py: don't let parent and child ui objects share header and prev_header

ui.py: use correct parentui while copying readhooks

changectx: search manifest delta for filenode

context: check self.__dict__ instead of using hasattr hasattr implicitly calls getattr, instantiating the field it is checking for.

Teach bdiff to support buffer objects manifest.add gives revlog.addrevision a buffer object, which may be cached and used for a second call in the same session (as mq does when pushing multiple patches). The other option would be to cast the buffer to str when caching it.

Test case for bdiff on buffer objects

hgweb: globally default to tip if no revision is specified

Support buffer interface in base85 codec

merge with crew

fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff

Don't generate git diff header for empty diffs

Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /)

NWI base URL detection fixes

make manifest-merging test reproduceable

Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:

merge with upstream

merge with upstream

fix localrepo.status when dealing with x-bit changes

extend test-flags

merge with upstream

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.

merge: pull user messages out to hg.py - add _update for shadowing in clone - add _showstats helper - remove update parameter defaults - move stats message and merge help messages

merge: update some docstrings

merge: various tidying update tests to handle corrected output and new workingctx display

context: change workingctx str() from . to <node>+

merge: use contexts in checkunknown and forgetremoved

merge: shortcircuit filemerge for identical files - use filectx.cmp to compare files - move merge messages into filemerge - kill the redundant resolving message - update tests

context: add cmp for filectxs

merge: pull file copy/move out of filemerge

merge: unify merge and copy actions

merge: swap file and mode args for act()

merge: finish removing nodes from action list

hgweb: add file sizes to manifest browsing

hgweb: remove obsolete listfiles function

merge: eliminate nodes from action list - eliminate my and other from merge and copy - eliminate node from get - use mctx for get - fix bug flag = a[2:] - pass mctx to recordupdates - use new filectx.size in recordupdates

filectx: add size method

run-tests: add --first switch to exit on first error

run-tests: add --retest switch -r reruns tests for which a .err file exists

filemerge: use contexts rather than my and other

fix workingfilectx parents and ancestor functions

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

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

[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

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

Add a base85 codec

Fix undetected change bug in rename tests

Update test output