Patchwork [1,of,3,STABLE] lfs: rename {pointer} to {lfspointer}

login
register
mail settings
Submitter Matt Harbison
Date Jan. 24, 2018, 2:37 a.m.
Message ID <c12195501c406b30a15c.1516761462@Envy>
Download mbox | patch
Permalink /patch/27055/
State Accepted
Headers show

Comments

Matt Harbison - Jan. 24, 2018, 2:37 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1516661260 18000
#      Mon Jan 22 17:47:40 2018 -0500
# Branch stable
# Node ID c12195501c406b30a15c796b4b728303cd189575
# Parent  de23345e2b6b880880896e27e5e2f745efa3799b
lfs: rename {pointer} to {lfspointer}

Per Martin von Zweigbergk's suggestion to keep this unambiguous, for when it is
migrated to {files} and friends.
Yuya Nishihara - Jan. 24, 2018, 11:35 a.m.
On Tue, 23 Jan 2018 21:37:42 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1516661260 18000
> #      Mon Jan 22 17:47:40 2018 -0500
> # Branch stable
> # Node ID c12195501c406b30a15c796b4b728303cd189575
> # Parent  de23345e2b6b880880896e27e5e2f745efa3799b
> lfs: rename {pointer} to {lfspointer}

Queued for stable, thanks.

Patch

diff --git a/hgext/lfs/__init__.py b/hgext/lfs/__init__.py
--- a/hgext/lfs/__init__.py
+++ b/hgext/lfs/__init__.py
@@ -371,7 +371,7 @@ 
     makemap = lambda v: {
         'file': v,
         'oid': pointers[v].oid(),
-        'pointer': templatekw.hybriddict(pointer(v)),
+        'lfspointer': templatekw.hybriddict(pointer(v)),
     }
 
     # TODO: make the separator ', '?
diff --git a/tests/test-lfs.t b/tests/test-lfs.t
--- a/tests/test-lfs.t
+++ b/tests/test-lfs.t
@@ -865,16 +865,16 @@ 
   oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   size 29
   x-is-binary 0
-  $ hg --cwd convert_lfs log -r 0 -T "{lfs_files % '{pointer % '{key}={value}\n'}'}"
+  $ hg --cwd convert_lfs log -r 0 -T "{lfs_files % '{lfspointer % '{key}={value}\n'}'}"
   version=https://git-lfs.github.com/spec/v1
   oid=sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   size=29
   x-is-binary=0
   $ hg --cwd convert_lfs log -r 0 \
-  >    -T '{lfs_files % "{get(pointer, "oid")}\n"}{lfs_files % "{pointer.oid}\n"}'
+  >    -T '{lfs_files % "{get(lfspointer, "oid")}\n"}{lfs_files % "{lfspointer.oid}\n"}'
   sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
-  $ hg --cwd convert_lfs log -r 0 -T '{lfs_files % "{pointer}\n"}'
+  $ hg --cwd convert_lfs log -r 0 -T '{lfs_files % "{lfspointer}\n"}'
   version=https://git-lfs.github.com/spec/v1 oid=sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024 size=29 x-is-binary=0
   $ hg --cwd convert_lfs \
   >     log -r 'all()' -T '{rev}: {lfs_files % "{file}: {oid}\n"}'