Skip to content
Snippets Groups Projects
  1. Dec 16, 2014
    • Siddharth Agarwal's avatar
      ignore: resolve ignore files relative to repo root (issue4473) (BC) · a04c7b74b3d5
      Siddharth Agarwal authored
      Previously these would be considered to be relative to the current working
      directory. That behavior is both undocumented and doesn't really make sense.
      There are two reasonable options for how to resolve relative paths:
      - relative to the repo root
      - relative to the config file
      
      Resolving these files relative to the repo root matches existing behavior with
      hooks. An earlier discussion about this is available at
      http://mercurial.markmail.org/thread/tvu7yhzsiywgkjzl.
      
      Thanks to Isaac Jurado <diptongo@gmail.com> for the initial patchset that
      spurred the discussion.
      a04c7b74b3d5
  2. Dec 18, 2014
  3. Dec 11, 2014
  4. Dec 19, 2014
  5. Dec 22, 2014
  6. Dec 18, 2014
    • Martin von Zweigbergk's avatar
      test-check-commit-hg: clarify misleading "commit message rules" error · 80a37f706011
      Martin von Zweigbergk authored
      The test case doesn't only check the commit message, but also the
      patch, which can result in confusing output like
      
        +  Revision df6f06d17100 does not comply to commit message rules
        +  ------------------------------------------------------
        +  32: adds double empty line
        +
        +
      
      even when there are no double blank lines in the commit message. Drop
      the "commit message" part to make it less confusing.
      80a37f706011
  7. Dec 21, 2014
    • Christian Ebert's avatar
      keyword: handle resolve to either parent · cb9d845406e5
      Christian Ebert authored
      Merged files are considered modified at commit time even if only 1 parent
      differs. In this case we must use the change context of this parent for
      expansion.
      
      The issue went unnoticed for long because it is only apparent until the next
      update to the merge revision - except in test-keyword where it was always
      staring us in the face.
      cb9d845406e5
    • Christian Ebert's avatar
      keyword: update test file syntax · bb679344c88d
      Christian Ebert authored
      bb679344c88d
  8. Dec 22, 2014
  9. Dec 18, 2014
    • Durham Goode's avatar
      context: return dirstate parents in workingctx.ancestors() · 11a160547d7f
      Durham Goode authored
      workingctx.ancestors() was not returning the dirstate parents as part of the
      result set. The only place this function is used is for copy detection when
      committing a file, and that code already checks the parents manually, so this
      change has no affect at the moment.
      
      I found it while playing around with changing how copy detection works.
      11a160547d7f
    • Mateusz Kwapich's avatar
      backout: add --commit option · 7cfe58983bff
      Mateusz Kwapich authored
      Mercurial backout command makes a commmit by default only when the backed out
      revision is the parent of working directory and doesn't commit in any other
      case.
      
      The --commit option changes behaviour of backout to make a commit whenever
      possible (i.e. there is no unresolved conflicts). This behaviour seems more
      intuitive to many use (especially git users migrating to hg).
      7cfe58983bff
  10. Dec 13, 2014
    • Ryan McElroy's avatar
      share: add option to share bookmarks · cd79fb4d75fd
      Ryan McElroy authored
      This patch adds the -B/--bookmarks option to the share command added by the
      share extension. All it does for now is create a marker, 'bookmarks.shared',
      that will be used by future code to implement the sharing functionality.
      cd79fb4d75fd
  11. Dec 17, 2014
    • Matt Mackall's avatar
      highlight: ignore Unicode's extra linebreaks (issue4291) · 7b8ff3fd11d3
      Matt Mackall authored
      Unicode and Python's unicode.splitlines() treat several extra legacy
      ASCII codepoints as linebreaks, even though the vast bulk of computing
      and Python's own str.splitlines() do not. Rather than introduce line
      numbering confusion, we filter them out when highlighting.
      7b8ff3fd11d3
  12. Dec 18, 2014
  13. Dec 15, 2014
    • Sean Farley's avatar
      templatekw: remove unneeded showtags · d69a7fc68ad5
      Sean Farley authored
      Now that we have the machinery of namespaces in-place, we use that instead of
      hand-rolling our own template function.
      
      Note, this can only be used for tags because both branches and bookmarks have
      special case logic for 'default' and the current bookmark (which is something
      outside the namespace api for now).
      d69a7fc68ad5
  14. Oct 17, 2014
    • Sean Farley's avatar
      namespaces: generate template keyword when registering a namespace · 9266d1dd6a6e
      Sean Farley authored
      For any namespace, we generate a template keyword. For example, given a
      namespace 'babar', we automatically have the ability to use it in a template:
      
      hg log -r . -T '{babars % "King: {babar}\n"}'
      
      Furthermore, we only generate this keyword for a namespace if one doesn't
      already exist. This is necessary for 'branches' and 'bookmarks' since both of
      those have concepts of 'current' (something outside the namespace api) and also
      allows extensions to override default behavior if desired.
      9266d1dd6a6e
  15. Dec 15, 2014
    • Sean Farley's avatar
      templatekw: add helper method to generate a template keyword for a namespace · 40fcf6c05217
      Sean Farley authored
      This marks our second feature of the namespace api: automatic template keyword.
      This patch adds a method that takes in a namespace and uses the node-to-name
      map to output the list of names.
      40fcf6c05217
    • Sean Farley's avatar
      namespaces: add names method to return list of names for a given node · 807ee1a02bb0
      Sean Farley authored
      In the previous patch, we added a node-to-name map property. This patch just
      exposes that interface to the api.
      807ee1a02bb0
    • Sean Farley's avatar
      namespaces: add nodemap property · 0fd778ef0f61
      Sean Farley authored
      This patch adds a node-to-name map property to the namespace. This is necessary
      because we cannot simply invert the name-to-node map because we do not assume
      the name-to-node map to be unique (for example, consider named branches: many
      nodes have one branch name).
      
      The node-to-name is helpful in log commands where we are already iterating over
      a set of nodes and want to display some kind of naming information to the user.
      0fd778ef0f61
    • Sean Farley's avatar
      namespaces: add method to get template name of namespace · 80e3cbe227d1
      Sean Farley authored
      This patch adds the public api for getting the template name of a namespace so
      that the next patch can use it to generate a template keyword automatically.
      80e3cbe227d1
    • Sean Farley's avatar
      namespaces: add template name of a namespace · 4c4c967814ef
      Sean Farley authored
      The template name property will be used in upcoming patches to automatically
      generate a template keyword. For example, given a namespace called 'babars', we
      will automatically generate a template keyword 'babar' such that we can use it
      in the following way,
      
      $ hg log -r . -T '{babars % "King: {babar}\n"}'
      4c4c967814ef
  16. Dec 18, 2014
  17. Dec 16, 2014
  18. Dec 11, 2014
  19. Dec 12, 2014
    • Augie Fackler's avatar
      manifest: disallow setting the node id of an entry to None · 6f53629ad273
      Augie Fackler authored
      manifest.diff() uses None as a special value to denote the absence of
      a file, so setting a file node to None means you then can't trust
      manifest.diff().
      
      This should also make future manifest work slightly easier.
      6f53629ad273
    • Augie Fackler's avatar
      context: stop setting None for modified or added nodes · b1179dabc6de
      Augie Fackler authored
      Instead use a magic value, so that we can identify modified or added
      nodes correctly when using manifest.diff().
      
      Thanks to Martin von Zweigbergk for catching that we have to update
      _buildstatus as well. That part eluded my debugging for some time.
      b1179dabc6de
  20. Dec 13, 2014
  21. Dec 17, 2014
    • Eric Sumner's avatar
      bundle2: lowercase part types · 414374cfb531
      Eric Sumner authored
      Since the capitalization no longer carries any meaning (previous diff), this
      patch normalizes all of the bundle2 part type strings to lower case.
      414374cfb531
  22. Dec 18, 2014
  23. Dec 17, 2014
    • Katsunori FUJIWARA's avatar
      memctx: calculate manifest correctly with newly-removed files (issue4470) · 200215cdf7aa
      Katsunori FUJIWARA authored
      Before this patch, "memctx._manifest" tries to get (and use normally)
      filectx also for newly-removed files, even though "memctx.filectx()"
      returns None for such files.
      
      To calculate manifest correctly even with newly-removed files, this
      patch does:
      
        - replace "man.iteritems()" for the loop by "self._status.modified"
          to avoid accessing itself to newly removed files
      
          this also reduces loop cost for large manifest.
      
        - remove files in "self._status.removed" from the manifest
      
      In this patch, amending is confirmed twice to examine both (1) newly
      removed files and (2) ones already removed in amended revision.
      200215cdf7aa
    • Katsunori FUJIWARA's avatar
      memctx: calculate manifest including newly added files correctly · 87a76cff7147
      Katsunori FUJIWARA authored
      Before this patch, "memctx._manifest" calculates the manifest
      according to the 1st parent. This causes the disappearance
      of newly added files from the manifest.
      
      For example, if newly added files aren't listed up in manifest of
      memctx, they aren't listed up in "added" field of "status" returned by
      "ctx.status()", and "{diff()}" (= "patch.diff") in "committemplate"
      shows nothing for them.
      
      To calculate manifest including newly added files correctly, this
      patch puts newly added files (= ones in "self._status.added") into the
      manifest.
      
      Some details of changes for "test-commit-amend.t" in this patch:
      
        - "touch foo" is replaced by "echo foo > foo", because newly added
          empty file can't be shown in "diff()" output without "diff.git"
          configuration
      
        - amending is confirmed twice to examine both (1) newly added files
          and (2) ones already added in amended revision
      87a76cff7147
    • Katsunori FUJIWARA's avatar
      memctx: calculate exact status being committed from specified files · 8063901e56cd
      Katsunori FUJIWARA authored
      Before this patch, "memctx._status" is initialized by "(files, [], [],
      [], [], [], [])" and this causes "memctx.modified" to include not
      only modified files but also added and removed ones incorrectly.
      
      This patch adds "_status" method to calculate exact status being
      committed according to "files" specified at construction time.
      
      Exact "_status" is useful to share/reuse logic of committablectx.
      
      This patch is also preparation for issues fixed by subsequent patches.
      
      Some details of changes for tests in this patch:
      
        - some filename lines are omitted in "test-convert-svn-encoding.t",
          because they are correctly listed up as "removed" files
      
          those lines are written out in "localrepository.commitctx" for
          "modified" and "added" files by "ui.note".
      
        - "| fixbundle" filterring in "test-histedit-fold.t" is omitted to
          check lines including "added" correctly
      
          "fixbundle" discards all lines including "added".
      8063901e56cd
Loading