- May 27, 2011
-
-
Adrian Buehlmann authored
This makes 'pull --rebase' consistent with the merge command, which already provides that option to control the merges
-
Martin Geisler authored
-
- May 26, 2011
-
-
Matt Mackall authored
-
Idan Kamara authored
-
- May 25, 2011
-
-
Paul Molodowitch authored
Currently, if there is a bare git subrepo, but it is at the "right" revision, calling dirty() will error because diff-index does not work on bare repos. This patch makes it so bare subrepos are always considered dirty.
-
Idan Kamara authored
and check if we got one before creating. note that the contents of the ui object might change after dispatch() returns (by options passed through --config for example), to ensure it doesn't, pass a copy() of it.
-
Idan Kamara authored
currently only stores the arguments.
-
- May 26, 2011
-
-
Steven Brown authored
Restore the previous diffstat behaviour of scaling by the maximum number of changes to a single file. Changeset f03f08240c32 modified the diffstat to be scaled by the total number of changes. This seems to have been unintentional.
-
- May 24, 2011
-
-
Peter Arrenbrecht authored
Firstly, I think we should do this for all new wire commands, just to be on the safe side. So I want to get this into the 1.9 release. Secondly, there actually is potential here that sometimes the server can know that the number of its nodes which can possibly still be undecided on the client is small. It might then just send them along directly (cutting short the end game). This, however, requires walking the graph on the server, which can be expensive, so for the moment we're not actually doing it.
-
- May 26, 2011
-
-
Matt Mackall authored
Switch users of wctx.delete(..., False) to forget.
-
Matt Mackall authored
It has substantially different semantics from forget at the command layer, so change it to avoid confusion. We can't simply combine it with remove because we need to explicitly drop non-added files in some cases like commit.
-
Martin Geisler authored
-
Sune Foldager authored
-
- May 25, 2011
-
-
Patrick Mezard authored
-
- May 24, 2011
-
-
Matt Mackall authored
-
Adrian Buehlmann authored
we already know at this point that they have been unlinked
-
Matt Mackall authored
-
Idan Kamara authored
-
Idan Kamara authored
interactively select changes to refresh
-
Idan Kamara authored
Also, don't create a backup dir if we have no files to backup. This is essential for qrefresh --interactive. Since we can't select individual files to qrefresh without eliminating already present changes, we have to backup all changes in the working copy to avoid refreshing unaccepted hunks. (thanks to Patrick for the idea)
-
Idan Kamara authored
-
Idan Kamara authored
This also fixes a bug where qrename would allow renaming a patch to a reserved name.
-
Idan Kamara authored
-
Augie Fackler authored
This new Python code should be equivalent in behavior to the if statement at line 312 of parsers.c. Without this, the pure-python parsers improperly ignore truncated revlogs as created in test-verify.t.
-
Adrian Buehlmann authored
-
Martin Geisler authored
Changeset 88f0e41d8802 introduced the unbundlehash capability and unconditionally hashed the heads on the client side. By mistake, the heads were also cased in the heads == ['force'] case.
-
Patrick Mezard authored
This was only used when reading patched files which is now done by backends.
-
Matt Mackall authored
-
- May 23, 2011
-
-
Idan Kamara authored
-
Idan Kamara authored
extensions that depend on other extensions (such as record) use this pattern to check if the dependant extension is available: try: mq = extensions.find('mq') except KeyError: return but since if an error occurs while loading an extension it leaves its entry in the _extensions map as None, we want to raise in that situation too. (rather than adding another check if the return value is None)
-
Adrian Buehlmann authored
-
- May 18, 2011
-
-
Adrian Buehlmann authored
requires ctypes Why is posixfile a class? Because the implementation needs to use the Python library call os.fdopen [1], which sets the 'name' attribute on the Python file object it creates to the mostly meaningless string '<fdopen>', since file descriptors don't have a name. But users of posixfile depend on the name attribute [2] being set to a proper value, like Python's built-in 'open' function sets it on file objects. Python file's name attribute is read-only, so we can't just assign to it after the file object has alrady been created. To solve this problem, we save the name of the file on a wrapper object, and delegate the file function calls to the wrapped (private) file object using __getattr__. [1] http://docs.python.org/library/os.html#os.fdopen [2] http://docs.python.org/library/stdtypes.html#file.name
-
- May 23, 2011
-
-
Peter Arrenbrecht authored
Extensions can hook discovery.findcommonincoming to filter out unwanted remote changesets. This patch makes getremotechanges respect the changed remote heads returned by such extensions.
-
Peter Arrenbrecht authored
-
Peter Arrenbrecht authored
-
Peter Arrenbrecht authored
-
- May 22, 2011
-
-
Idan Kamara authored
-
Idan Kamara authored
-
Adrian Buehlmann authored
protects changing flags on merged files (util.setflags call on line 341)
-
- May 21, 2011
-
-
Adrian Buehlmann authored
we're using the auditor of the repo wopener, since this is a path that belongs to the tree we're updating to
-