Giorgos Keramidas <keramida@ceid.upatras.gr> [Tue, 10 Oct 2006 21:03:24 +0300] rev 3351
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:
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 16:19:11 -0700] rev 3350
gitweb: add file diff view
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 11 Oct 2006 23:31:05 +0200] rev 3349
merge with crew
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3348
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.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3347
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)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3346
call ui.updateopts only after changing directories
This corrects --config paths.foo=bar when it's used with --cwd
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3345
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.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3344
move the parsing of --config options to commands.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3343
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.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3342
ui.py: change the overlay from a dict to a SafeConfigParser.
This also fixes what's probably a bug - configitems was ignoring the overlay.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3341
ui.py: don't query parentui.cdata when looking up config items.
We copied the contents of parentui.cdata on initialization.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3340
ui.py: make walkconfig use configitems
Also make it sort the available config sections while we're at it.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3339
ui.py: move common code out of config and configbool
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3338
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.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3337
ui.py: don't let parent and child ui objects share header and prev_header
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 10 Oct 2006 18:43:20 -0300] rev 3336
ui.py: use correct parentui while copying readhooks
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 13:56:35 -0700] rev 3335
changectx: search manifest delta for filenode
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 13:34:12 -0700] rev 3334
context: check self.__dict__ instead of using hasattr
hasattr implicitly calls getattr, instantiating the field it is
checking for.
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 12:06:14 -0700] rev 3333
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.
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 12:02:06 -0700] rev 3332
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 11:30:59 -0700] rev 3331
hgweb: globally default to tip if no revision is specified
Brendan Cully <brendan@kublai.com> [Wed, 11 Oct 2006 09:27:57 -0700] rev 3330
Support buffer interface in base85 codec
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 11 Oct 2006 16:41:52 +0200] rev 3329
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 11 Oct 2006 16:35:09 +0200] rev 3328
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
Brendan Cully <brendan@kublai.com> [Tue, 10 Oct 2006 14:48:26 -0700] rev 3327
Don't generate git diff header for empty diffs
Brendan Cully <brendan@kublai.com> [Tue, 10 Oct 2006 10:54:22 -0700] rev 3326
Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /)
Brendan Cully <brendan@kublai.com> [Tue, 10 Oct 2006 10:28:20 -0700] rev 3325
NWI base URL detection fixes
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 10 Oct 2006 11:47:19 +0200] rev 3324
merge with upstream
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 03:39:44 -0500] rev 3323
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
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 02:31:02 -0500] rev 3322
merge: update some docstrings
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 10 Oct 2006 09:30:05 +0200] rev 3321
merge with upstream
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 02:15:20 -0500] rev 3320
merge: various tidying
update tests to handle corrected output and new workingctx display
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 02:11:59 -0500] rev 3319
context: change workingctx str() from . to <node>+
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:43:58 -0500] rev 3318
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:16:06 -0500] rev 3317
merge: shortcircuit filemerge for identical files
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:13:03 -0500] rev 3316
context: add cmp for filectxs
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:54:00 -0500] rev 3315
merge: pull file copy/move out of filemerge
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:41:55 -0500] rev 3314
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:32:30 -0500] rev 3313
merge: swap file and mode args for act()
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:22:03 -0500] rev 3312
merge: finish removing nodes from action list
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:07:46 -0500] rev 3311
hgweb: add file sizes to manifest browsing
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:46:05 -0500] rev 3310
hgweb: remove obsolete listfiles function
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:23:25 -0500] rev 3309
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
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:20:48 -0500] rev 3308
filectx: add size method
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:08:41 -0500] rev 3307
run-tests: add --first switch to exit on first error
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:05:11 -0500] rev 3306
run-tests: add --retest switch
-r reruns tests for which a .err file exists
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 21:27:04 -0500] rev 3305
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 21:04:25 -0500] rev 3304
fix workingfilectx parents and ancestor functions
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 20:32:03 -0500] rev 3303
merge: pass contexts to applyupdates
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 18:13:38 -0500] rev 3302
merge: don't call hooks for revert
- don't call hooks for revert
- use extra variables to avoid swapping contexts
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 16:07:19 -0500] rev 3301
merge: use contexts for manifestmerge
- take ma, backwards, and copy out of update
- move findcopies call inside manifestmerge
- pass repo rather than ui
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 14:02:01 -0500] rev 3300
commit: unify file-level commit code
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 10 Oct 2006 00:02:30 +0200] rev 3299
fix localrepo.status when dealing with x-bit changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 21:48:44 +0200] rev 3298
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 21:22:55 +0200] rev 3297
merge with upstream
Matt Mackall <mpm@selenic.com> [Sun, 08 Oct 2006 20:18:59 -0500] rev 3296
Use filelog.cmp in checkfilemerge
Matt Mackall <mpm@selenic.com> [Sun, 08 Oct 2006 19:57:45 -0500] rev 3295
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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 15:52:37 +0200] rev 3294
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 15:44:20 +0200] rev 3293
bundle --base: use the right set for the base
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 08 Oct 2006 20:27:23 -0300] rev 3292
fix bash completion of debug commands; add test for debugcomplete
The debugconfig -> showconfig renaming broke things.