diff --git a/hgext/shelve.py b/hgext/shelve.py index 3cd977d5a16be12da19037d44f6468e4709007af_aGdleHQvc2hlbHZlLnB5..da121c9dc0f27f0752814cd57db1ee840775cf49_aGdleHQvc2hlbHZlLnB5 100644 --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -79,7 +79,7 @@ backupdir = 'shelve-backup' shelvedir = 'shelved' -shelvefileextensions = ['hg', 'patch'] +shelvefileextensions = ['hg', 'patch', 'shelve'] # universal extension is present in all types of shelves patchextension = 'patch' @@ -409,6 +409,8 @@ ui.status(_("nothing changed\n")) def _shelvecreatedcommit(repo, node, name): + info = {'node': nodemod.hex(node)} + shelvedfile(repo, name, 'shelve').writeinfo(info) bases = list(mutableancestors(repo[node])) shelvedfile(repo, name, 'hg').writebundle(bases, node) with shelvedfile(repo, name, patchextension).opener('wb') as fp: diff --git a/tests/test-shelve.t b/tests/test-shelve.t index 3cd977d5a16be12da19037d44f6468e4709007af_dGVzdHMvdGVzdC1zaGVsdmUudA==..da121c9dc0f27f0752814cd57db1ee840775cf49_dGVzdHMvdGVzdC1zaGVsdmUudA== 100644 --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -102,6 +102,7 @@ $ ls .hg/shelve-backup default.hg default.patch + default.shelve checks to make sure we dont create a directory or hidden file while choosing a new shelve name @@ -206,5 +207,6 @@ $ ls .hg/shelve-backup/ default-1.hg default-1.patch + default-1.shelve default.hg default.patch @@ -209,5 +211,6 @@ default.hg default.patch + default.shelve local edits should not prevent a shelved change from applying @@ -250,5 +253,6 @@ $ ls .hg/shelve-backup/ default-01.hg default-01.patch + default-01.shelve default-1.hg default-1.patch @@ -253,4 +257,5 @@ default-1.hg default-1.patch + default-1.shelve default.hg default.patch @@ -255,5 +260,6 @@ default.hg default.patch + default.shelve $ hg unshelve abort: no shelved changes to apply! @@ -314,5 +320,6 @@ $ ls .hg/shelve-backup/ default-01.hg default-01.patch + default-01.shelve wibble.hg wibble.patch @@ -317,5 +324,6 @@ wibble.hg wibble.patch + wibble.shelve cause unshelving to result in a merge with 'a' conflicting