Thomas Arendsen Hein
10593de67b
Keep session variables when linking from hgwebdir's index to repositories.
2006-10-12 17:06:51 +02:00
Thomas Arendsen Hein
2b666e3a4f
Fixed typo in gitweb templates.
2006-10-12 16:37:03 +02:00
Thomas Arendsen Hein
01e8022cb1
hgweb: Apply the new method of passing session variables to links.
2006-10-11 22:01:24 +02:00
Thomas Arendsen Hein
0a1b56c636
hgweb: Keep session variables (currently only style) in HTML forms, too.
...
Adjusted default and gitweb template for this.
2006-10-11 20:59:37 +02:00
Thomas Arendsen Hein
9e595ef83b
templater: Better exception for errors in foo%bar formatting.
2006-10-11 20:53:02 +02:00
Benoit Boissinot
a1bd76f99b
nodesbetween: fix a bug with duplicate heads
2006-10-12 11:40:26 +02:00
Brendan Cully
0504e469fe
hgweb: trap lookup errors
2006-10-11 16:56:41 -07:00
Brendan Cully
2c17d58455
Add better error message for bad commands
2006-10-11 16:50:17 -07:00
Brendan Cully
7c6d11cbd1
gitweb: Add error text to error page
2006-10-11 16:49:53 -07:00
Brendan Cully
2d1a37400d
gitweb: fix link on file name in filenodelink
2006-10-11 16:39:42 -07:00
Brendan Cully
79084fa005
gitweb: fix last change field in summary
2006-10-11 16:32:06 -07:00
Brendan Cully
349e6d786c
Merge with main
2006-10-11 16:20:35 -07:00
Brendan Cully
312f6f2425
gitweb: add file diff view
2006-10-11 16:19:11 -07:00
Matt Mackall
e5ce68c388
Merge with crew
2006-10-11 17:37:48 -05:00
Benoit Boissinot
c5ef21b682
merge with crew
2006-10-11 23:31:05 +02:00
Brendan Cully
fb4e783895
changectx: search manifest delta for filenode
2006-10-11 13:56:35 -07:00
Matt Mackall
3d4c9ff34c
make manifest-merging test reproduceable
2006-10-11 15:52:08 -05:00
Brendan Cully
a3547ef308
context: check self.__dict__ instead of using hasattr
...
hasattr implicitly calls getattr, instantiating the field it is
checking for.
2006-10-11 13:34:12 -07:00
Brendan Cully
65be154af0
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.
2006-10-11 12:06:14 -07:00
Brendan Cully
1931dc410c
Test case for bdiff on buffer objects
2006-10-11 12:02:06 -07:00
Brendan Cully
d91d2a7969
hgweb: globally default to tip if no revision is specified
2006-10-11 11:30:59 -07:00
Brendan Cully
3f0262092f
Support buffer interface in base85 codec
2006-10-11 09:27:57 -07:00
Benoit Boissinot
394e9d8946
merge with crew
2006-10-11 16:41:52 +02:00
Benoit Boissinot
cec92b2bd7
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
2006-10-11 16:35:09 +02:00
Brendan Cully
2b9e1a5fbd
Don't generate git diff header for empty diffs
2006-10-10 14:48:26 -07:00
Alexis S. L. Carvalho
3eeaf02465
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.
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
105915ca0d
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)
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
561830e0aa
call ui.updateopts only after changing directories
...
This corrects --config paths.foo=bar when it's used with --cwd
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
b5be394282
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.
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
0cc9fd2297
move the parsing of --config options to commands.py
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
0b096956bb
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.
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
e108a1d368
ui.py: change the overlay from a dict to a SafeConfigParser.
...
This also fixes what's probably a bug - configitems was ignoring the overlay.
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
2a77e52007
ui.py: don't query parentui.cdata when looking up config items.
...
We copied the contents of parentui.cdata on initialization.
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
615137ec99
ui.py: make walkconfig use configitems
...
Also make it sort the available config sections while we're at it.
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
f33b5d1816
ui.py: move common code out of config and configbool
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
2182538090
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.
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
5ea7f93fd6
ui.py: don't let parent and child ui objects share header and prev_header
2006-10-10 18:43:20 -03:00
Alexis S. L. Carvalho
4cb87ef8d8
ui.py: use correct parentui while copying readhooks
2006-10-10 18:43:20 -03:00
Giorgos Keramidas
b10311c5e9
Revert changeset d48690da3368.
...
It breaks 'hg merge && hg up -c REV' when files exist only in one of the
manifests, making hg throw a traceback like:
2006-10-10 21:03:24 +03:00
Brendan Cully
b373d10384
Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /)
2006-10-10 10:54:22 -07:00
Brendan Cully
951d20240e
NWI base URL detection fixes
2006-10-10 10:28:20 -07:00
Thomas Arendsen Hein
60d29e0fd8
merge with upstream
2006-10-10 11:47:19 +02:00
Matt Mackall
fef0705ae8
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
2006-10-10 03:39:44 -05:00
Matt Mackall
47200ceb34
merge: update some docstrings
2006-10-10 02:31:02 -05:00
Thomas Arendsen Hein
f8cc3a01a4
merge with upstream
2006-10-10 09:30:05 +02:00
Matt Mackall
2e860ba70d
merge: various tidying
...
update tests to handle corrected output and new workingctx display
2006-10-10 02:15:20 -05:00
Matt Mackall
208002d0f3
context: change workingctx str() from . to <node>+
2006-10-10 02:11:59 -05:00
Matt Mackall
285d3e6b86
merge: use contexts in checkunknown and forgetremoved
2006-10-10 01:43:58 -05:00
Matt Mackall
41f0942fa0
merge: shortcircuit filemerge for identical files
...
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
2006-10-10 01:16:06 -05:00
Matt Mackall
87112abb50
context: add cmp for filectxs
2006-10-10 01:13:03 -05:00
