Skip to content
Snippets Groups Projects
  1. Apr 14, 2015
  2. May 15, 2015
  3. Apr 14, 2015
    • Ryan McElroy's avatar
      bookmarks: rename bookmarkcurrent to activebookmark (API) · a02d293a
      Ryan McElroy authored
      Today, the terms 'active' and 'current' are interchangeably used throughout the
      codebase in reference to the active bookmark (the bookmark that will be updated
      with the next commit). This leads to confusion among developers and users.
      This patch is part of a series to standardize the usage to 'active' throughout
      the mercurial codebase and user interface.
      a02d293a
  4. Apr 27, 2015
    • Laurent Charignon's avatar
      shelve: make the interactive mode experimental · 3510ec97
      Laurent Charignon authored
      While fixing issue4304: "record: allow editing new files" we introduced
      changes in record/crecord. These changes need to be matched with changes in any
      command using record. Shelve is one of these commands and the changes have
      not been made for this release. Therefore, shelve -i should be an experimental
      feature for this release.
      3510ec97
  5. Apr 12, 2015
  6. Mar 25, 2015
  7. Jan 15, 2015
    • Eric Sumner's avatar
      changegroup.writebundle: provide ui · cda18ded
      Eric Sumner authored
      The next diff will add support for writing bundle2 files to writebundle, but
      the bundle2 generator wants access to a ui object.  This changes the signature
      and callsites to pass one in.
      cda18ded
    • Angel Ezquerra's avatar
      localrepo: remove all external users of localrepo.opener · 7cc77030
      Angel Ezquerra authored
      This change touches every module in which repository.opener was being used, and
      changes it for the equivalent repository.vfs. This is meant to make it easier
      to split the repository.vfs into several separate vfs.
      
      It should now be possible to remove localrepo.opener.
      7cc77030
  8. Oct 04, 2014
  9. Oct 10, 2014
  10. Oct 08, 2014
    • Jordi Gutiérrez Hermoso's avatar
      shelve: don't delete "." when rebase is a no-op (issue4398) · d43d116a
      Jordi Gutiérrez Hermoso authored
      When unshelving and facing a conflict, if we resolve all conflicts in
      favour of the committed changes instead of the shelved changes, then
      the ensuing implicit rebase is a no-op. That is, there is nothing to
      rebase. In this case, there are no extra intermediate shelve commits
      to strip either. Prior to this change, the commit being unshelved to
      would be marked for destruction in a rather catastrophic way.
      
      The relevant part of the test case failed as follows:
      
          $ hg unshelve -c
          unshelve of 'default' complete
          $ hg diff
          warning: ignoring unknown working parent 33f7f61e6c5e!
          diff --git a/a/a b/a/a
          new file mode 100644
          --- /dev/null
                 b/a/a
          @@ -0,0   1,3 @@
            a
            c
            x
          $ hg status
          warning: ignoring unknown working parent 33f7f61e6c5e!
          M a/a
          ? a/a.orig
          ? foo/foo
          $ hg summary
          warning: ignoring unknown working parent 33f7f61e6c5e!
          parent: -1:000000000000  (no revision checked out)
          branch: default
          commit: 1 modified, 2 unknown (new branch head)
          update: 4 new changesets (update)
      
      With this change, this test case now passes.
      d43d116a
  11. Sep 25, 2014
  12. Sep 30, 2014
  13. Aug 15, 2014
  14. Jul 24, 2014
    • Jordi Gutiérrez Hermoso's avatar
      strip: remove -b/--backup codepaths · 44547222
      Jordi Gutiérrez Hermoso authored
      cset ba3bc6474bbf has removed this option. This commit just tidies the
      code that was associated to it. It also fixes the internal calls to
      the strip() function.
      
      Before this change, any function that thought it would want as a final
      safety to keep a partial backup bundle (bundling changes not linearly
      related to the current change being stripped), had to explicitly pass
      a backup="strip" option. With this change, these backups are always
      kept in case of an exception and always removed if there is no
      exception. Only full backups can be specified with backup=True or no
      full backups with backup=False.
      44547222
  15. Aug 05, 2014
    • Pierre-Yves David's avatar
      shelve: use `targetphase` while unbundling · 8d99c107
      Pierre-Yves David authored
      This removes the last manual phase movement in shelve.
      8d99c107
    • Pierre-Yves David's avatar
      shelve: do not retract phase boundary by hand · 122fa736
      Pierre-Yves David authored
      We rely on the internal mechanism to commit the changeset in the right state.
      This is similar to what the mq extension is doing.
      
      This is an important change as we plan to move phase movement with the
      transaction. Avoiding phase movement from high level code will avoid them the
      burden of transaction handling. It is also important to limit the need for
      transaction handling as this limits the odds of people messing up. Most common
      expected mess-up is to use a different transaction for changesets creation and
      phase adjustment.
      122fa736
  16. Aug 02, 2014
    • Katsunori FUJIWARA's avatar
      shelve: pass 'editform' argument to 'cmdutil.getcommiteditor' · dabf8fb8
      Katsunori FUJIWARA authored
      This patch passes 'editform' argument according to the format below:
      
        EXTENSION[.COMMAND][.ROUTE]
      
        - EXTENSION: name of extension
        - COMMAND: name of command, if there are two or more commands in EXTENSION
        - ROUTE: name of route, if there are two or more routes in COMMAND
      
      In this patch:
      
        - 'shelve' is used as COMMAND
        - ROUTE is omitted
      dabf8fb8
  17. Jun 20, 2014
    • Katsunori FUJIWARA's avatar
      shelve: accept '--edit' like other commands creating new changeset · 37a5decc
      Katsunori FUJIWARA authored
      After this patch, users can invoke editor for the commit message by
      '--edit' option regardless of '--message'.
      37a5decc
    • Katsunori FUJIWARA's avatar
      shelve: refactor option combination check to easily add new ones · aad28ff8
      Katsunori FUJIWARA authored
      Before this patch, the name of a newly added option had to be added
      into each string that was passed to the "checkopt()" internal
      function: these are white-space-separated list of un-acceptable option
      names (= "black list" for the specified "opt").
      
      This new option had to be added into multiple strings because each
      option could belong to only one action of "create", "cleanup",
      "delete" or "list".
      
      In addition to this redundancy, each string passed to "checkopt()" was
      already too long to include a new one.
      
      This patch refactors option combination check to make it easier to add
      a new option in a subsequent patch.
      
      New "checkopt()" only takes one action ("cleanup", "delete" or
      "list"), and checks whether all explicitly activated options are
      allowed for it or not (if specified action is activated in "opts").
      
      The "date" entry is listed in "allowables", but commented out,
      because:
      
        - "date" shouldn't be checked for test
      
          checking "date" causes unexpected failure of "test-shelve.t",
          because "run-test.py" puts "[default] shelve = --date '0 0'" into
          hgrc.
      
        - explicitly listing it can advertise that ignoring it is intentional
      
      This patch doesn't choose "white list" for the specified "opt", to
      avoid treating global options.
      aad28ff8
  18. Apr 14, 2014
  19. Mar 08, 2014
  20. Apr 07, 2014
  21. Apr 04, 2014
  22. Apr 01, 2014
  23. Feb 09, 2014
    • Mads Kiilerich's avatar
      shelve: status messages from unshelve · 0ac94c0a
      Mads Kiilerich authored
      It was hard for the user to know what was going on when unshelving - especially
      if the user had to resolve conflicts and thus got to see the intermediate
      states.
      
      Seeing that pending changes was gone could scare the user, make him panic, and
      do stuff that really made him lose data.
      
      Merging (both when rebasing and with pending changes) also requires some
      understanding of where in the process you are and what you are merging.
      
      To help the user we now show a couple of status messages (when relevant):
        temporarily committing pending changes (restore with 'hg unshelve --abort')
        rebasing shelved changes
      0ac94c0a
    • Mads Kiilerich's avatar
      shelve: be quiet when unshelve pulls from the shelve bundle · e584fc30
      Mads Kiilerich authored
      unshelve was quite verbose and it was hard for a user to follow what really was
      going on. It ended up saying 'added 1 changesets' ... but the user just
      expected and got pending changes and never saw any changeset.
      
      The use of bundles is an implementation detail that we don't have to leak here.
      
      Pulling is quite verbose, optimized for pulling many changesets from remote
      repos - that is not the case here.
      
      Instead, set the quiet flag when pulling the bundle - not only when temporarily
      committing pending changes.
      
      The 'finally' restore of ui.quiet is moved to the outer try/finally used for
      locking.
      e584fc30
    • Mads Kiilerich's avatar
      shelve: add 'changes to' prefix to default shelve message · 66359d8b
      Mads Kiilerich authored
      The shelved changes _could_ perhaps be amended to the parent changeset but it
      _is_ not the parent changeset. Using the description from the parent changeset
      is thus wrong and confusing.
      
      Instead, add a 'changes to' prefix.
      66359d8b
    • Mads Kiilerich's avatar
      shelve: mention FILE options in help · fc535464
      Mads Kiilerich authored
      Shelve do normally take a list of files or patterns to shelve and the command
      summary should thus show [FILE]...
      
      Note: --delete is a bit special and interpret the parameters as a list of
      shelve names. This change makes that even less obvious from the help. Too bad
      - we can't please everyone.
      fc535464
    • Mads Kiilerich's avatar
      shelve: mention walk options in help · 0b7a9940
      Mads Kiilerich authored
      0b7a9940
    • Mads Kiilerich's avatar
      shelve: really pass publicancestors to changegroupsubset - not the parents · 3392695a
      Mads Kiilerich authored
      publicancestors returned the parents of the public ancestors ... and
      changegroupsubset used the parents of these as base for the bundle. That gave
      bundles with one layer of changesets more than necessary.
      3392695a
Loading