- Feb 10, 2011
-
-
Gilles Moris authored
Previously, when rolling back a transaction, some users could be confused between the level to which the store is rolled back, and the new parents of the working directory. $ hg rollback rolling back to revision 4 (undo commit) With this change: $ hg rollback repository tip rolled back to tip revision 4 (undo commit) working directory now based on revision 2 and 1 So now the user can realize that the store has been rolled back to an older tip, but also that the working directory may not on the tip (here we are rolling back the merge of the heads 2 and 1)
-
- Feb 20, 2011
-
-
kiilerix authored
Invalid requests could give an unhandled ErrorResponse. Now this ErrorResponse is handled like other ErrorResponses so the client gets an error message which also is logged on the server.
-
kiilerix authored
Very handy if the exception should appear in output.
-
kiilerix authored
Other exceptions than StandardExceptions were left to the default error handler which was muted when running in daemon mode. Now all Exceptions are handled and logged to the log file.
-
Martin Geisler authored
-
- Feb 18, 2011
-
-
Steve Borho authored
The trailing comma was causing a ValueError. See https://bitbucket.org/tortoisehg/thg/issue/132
-
kiilerix authored
This happened to crash in subrepo setups when the base class variable was modified twice. Now we don't modify the class variable but an instance copy.
-
kiilerix authored
stdout could have content in its buffer while a subprocess ran and emitted output. Flushing stdout ensures that output now comes in the right order.
-
kiilerix authored
I must have lost the insecure cert warning in a last minute patch series cleanup of 08f9c587141f.
-
- Feb 16, 2011
-
-
Oleg Stepanov authored
-
- Feb 17, 2011
-
-
Wagner Bruna authored
The archive list generator was holding a reference to each temporary ui copy passed by rawentries(), so the memory usage for index generation growed proportionally to the ui object size and the amount of repositories. By returning a list instead, the temporary reference is dropped immediately.
-
Wagner Bruna authored
-
Steve Losh authored
-
- Feb 16, 2011
-
-
Augie Fackler authored
-
- Feb 17, 2011
-
-
Martin Geisler authored
-
Martin Geisler authored
-
- Feb 16, 2011
-
-
Wagner Bruna authored
-
Wagner Bruna authored
-
Kevin Bullock authored
This changes the prompts on git subrepos to show only the first seven digits of git changeset IDs (as git's command line does): $ hg update subrepository sources for s differ (in checked out version) use (l)ocal source (32a3438) or (r)emote source (da5f5b1)?
-
Matt Mackall authored
-
Adrian Buehlmann authored
We can stop pretending that we have to support anything else than '/' for concatenating path elements anywhere. Windows deals just fine with '/' in file paths and we already have plenty of places which produce paths containing '/' anyway when running on Windows.
-
David Soria Parra authored
We restrict : to 1. make it easer to convert bookmarks to git branches, 2. use : later for a syntax to push a local bookmark to a remote bookmark of a different name. \0, \n, \r are fobbidden they are used to separate bookmarks in the bookmark file. This change breaks backward compatbility as ':' was an allowed character in previous versions.
-
kiilerix authored
-
kiilerix authored
These tests fails for me with Python 2.6(.nothing)
-
kiilerix authored
-
kiilerix authored
-
kiilerix authored
-
kiilerix authored
We use self.ui unconditionally anyway so we would have noticed if it in some cases wasn't set.
-
kiilerix authored
hgweb requires OpenSSL for serving https.
-
- Feb 09, 2011
-
-
Erik Zielke authored
Consider a repository with a single subrepository. The changesets in the main repository reference the subrepository changesets like this: m0 -> s0 m1 -> s1 m2 -> s2 Starting from a state (m1, s0), doing 'hg update m2' in the main repository will yield a conflict: the subrepo is at revision s0 but the target revision says it should be at revision s2. Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus ignore the conflict between the working copy and the target revision. With this change, the user is prompted to resolve the conflict by choosing which revision he wants. This is consistent with 'hg merge', which also prompts the user when it detects conflicts in the merged .hgsubstate files. The prompt looks like this: $ hg update tip subrepository sources for my-subrepo differ use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?
-
- Feb 16, 2011
-
-
David Soria Parra authored
-
David Soria Parra authored
-
Martin Geisler authored
-
- Feb 09, 2011
-
-
Erik Zielke authored
-
- Feb 03, 2011
-
-
Martin Geisler authored
These result lists were only built for the side effects, and so a normal loop is just as good and more straight-forward.
-
- Feb 15, 2011
-
-
Patrick Mezard authored
The default behaviour is to commit subrepositories with uncommitted changes. In my experience this is usually undesirable: - Changes to dependencies are often debugging leftovers - Real changes should generally be applied on the source project directly, tested then committed. This is not always possible, subversion subrepos may include only a small part of the source project, without the tests. Setting ui.commitsubrepos=no will now abort commits containing such modified subrepositories like: $ hg --config ui.commitsubrepos=no ci -m msg abort: uncommitted changes in subrepo sub I ruled out the hook solution because it does not easily take --include/exclude options in account. Also, my main concern is whether this flag could cause problems with extensions. If there are legitimate reasons for callers to override this behaviour (I could not find any), they might either override at ui level, or we could add an argument to localrepo.commit() later. v2: - Renamed ui.commitsubs to ui.commitsubrepos - Mention the configuration entry in hg help subrepos
-
Matt Mackall authored
-
André Sintzoff authored
-
Adrian Buehlmann authored
instead of open() and os.unlink() Avoids potential issues with file access on Windows (e.g. AV-scanners).
-
Kevin Bullock authored
Clarifies the help text for the bookmarks command regarding the requirements for pushing or pulling bookmarks.
-