{"thread":{"id":"16501","subject":"[StGit] Import file(s) problem","startedAt":"2008-11-27T16:08:21Z","lastAt":"2008-11-28T15:31:23Z","messageCount":4,"participants":["Shinya Kuribayashi","Catalin Marinas","Karl Hasselström"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"96625","messageId":"492EC5F5.2050807@ruby.dti.ne.jp","threadId":"16501","inReplyTo":null,"subject":"[StGit] Import file(s) problem","fromName":"Shinya Kuribayashi","fromEmail":"skuribay@ruby.dti.ne.jp","sentAt":"2008-11-27T16:08:21Z","receivedAt":"2008-11-27T16:08:21Z","isPatch":false,"sender":{"key":"skuribay@ruby.dti.ne.jp","avatar":null},"body":"Hi Catalin and Karl,\n\nToday I encountered a problem when importing a patch.  I don't know this\nis a known issue or not. If there are good workarounds for this, I'd\nlike to know that.  Any comments are appreciated.\n\n\nSteps to reproduce\n-------------------\n\n1. Prepare a patch, say stg-test.patch\n\n2. Rename it to have '..' extension\n\n   $ mv stg-test.patch stg-test..patch\n\n3. Import it\n\n   $ stg import /path/to/stg-test..patch\n\n   You can see a lot of errors.  See the log below.\n\n4. At this point, just few stg operations are available.  I had to\n   switch to an other branch, then force deleting the corrupted branch\n   to return to the original state.\n\nNote\n-----\n\nThe same goes to stg import -m [e-mail file].  So this seems to be\ntrigged due to the wrong '..' extension.\n\nLog\n----\n\nskuribay@ubuntu:~/kernel/stgit.git$ (modify some file(s))\nskuribay@ubuntu:~/kernel/stgit.git$ \nskuribay@ubuntu:~/kernel/stgit.git$ stg diff >> ../stg-test.patch\nskuribay@ubuntu:~/kernel/stgit.git$ \nskuribay@ubuntu:~/kernel/stgit.git$ stg status --reset\nskuribay@ubuntu:~/kernel/stgit.git$ \nskuribay@ubuntu:~/kernel/stgit.git$ stg branch --create foo\nChecking for changes in the working directory ... done\nRecording as a local branch\nBranch \"foo\" created\nskuribay@ubuntu:~/kernel/stgit.git$ cd ../\nskuribay@ubuntu:~/kernel$ \nskuribay@ubuntu:~/kernel$ mv stg-test.patch stg-test..patch\nskuribay@ubuntu:~/kernel$ \nskuribay@ubuntu:~/kernel$ cd -\n/home/skuribay/kernel/stgit.git\nskuribay@ubuntu:~/kernel/stgit.git$ stg import ../stg-test..patch\nChecking for changes in the working directory ... done\nfatal: Cannot lock the ref 'refs/patches/foo/stg-test..patch'.\nTraceback (most recent call last):  \n  File \"/home/skuribay/bin/stg\", line 43, in <module>\n    main()\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/main.py\", line 175, in main\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/main.py\", line 154, in _main\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/commands/common.py\", line 482, in write_log\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 372, in compat_log_entry\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 322, in log_entry\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 179, in from_stack\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 179, in <genexpr>\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py\", line 157, in get\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py\", line 486, in __getitem__\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py\", line 147, in create_patch\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py\", line 26, in commit\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py\", line 449, in get\nKeyError: 'refs/patches/foo/stg-test..patch'\nskuribay@ubuntu:~/kernel/stgit.git$ \nskuribay@ubuntu:~/kernel/stgit.git$ stg diff\nError: Unhandled exception:\nTraceback (most recent call last):  \n  File \"home/skuribay/lib/python2.5/site-packages/stgit/main.py\", line 142, in _main\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/commands/common.py\", line 491, in setup\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 524, in compat_log_external_mods\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 511, in log_external_mods\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 322, in log_entry\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 179, in from_stack\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 179, in <genexpr>\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py\", line 157, in get\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py\", line 486, in __getitem__\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py\", line 147, in create_patch\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py\", line 26, in commit\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py\", line 449, in get\nKeyError: 'refs/patches/foo/stg-test..patch'\nskuribay@ubuntu:~/kernel/stgit.git$ \nskuribay@ubuntu:~/kernel/stgit.git$ stg series\n> stg-test..patch\nskuribay@ubuntu:~/kernel/stgit.git$ stg branch master\nError: Unhandled exception:\nTraceback (most recent call last):  \n  File \"home/skuribay/lib/python2.5/site-packages/stgit/main.py\", line 142, in _main\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/commands/common.py\", line 501, in setup\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/commands/common.py\", line 495, in setup\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/commands/common.py\", line 491, in setup\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 524, in compat_log_external_mods\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 511, in log_external_mods\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 322, in log_entry\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 179, in from_stack\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/log.py\", line 179, in <genexpr>\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py\", line 157, in get\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py\", line 486, in __getitem__\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py\", line 147, in create_patch\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/stack.py\", line 26, in commit\n  File \"home/skuribay/lib/python2.5/site-packages/stgit/lib/git.py\", line 449, in get\nKeyError: 'refs/patches/foo/stg-test..patch'\nskuribay@ubuntu:~/kernel/stgit.git$ \nskuribay@ubuntu:~/kernel/stgit.git$ git checkout master\nSwitched to branch \"master\"\nskuribay@ubuntu:~/kernel/stgit.git$ stg branch -l\nAvailable branches:\n  s     foo     |\n> s     master  |\nskuribay@ubuntu:~/kernel/stgit.git$ stg branch --delete foo\nDeleting branch \"foo\" ...\n  stg branch: Cannot delete: the series still contains patches\nskuribay@ubuntu:~/kernel/stgit.git$ \nskuribay@ubuntu:~/kernel/stgit.git$ stg branch --delete --force foo\nDeleting branch \"foo\" ...\n  Warning: refs/patches/foo/stg-test..patch does not exist\ndone\nskuribay@ubuntu:~/kernel/stgit.git$ \nskuribay@ubuntu:~/kernel/stgit.git$ stg branch -l\nAvailable branches:\n> s     master  |\nskuribay@ubuntu:~/kernel/stgit.git$ \nskuribay@ubuntu:~/kernel/stgit.git$ rm -f ../stg-test..patch\nskuribay@ubuntu:~/kernel/stgit.git$ \nskuribay@ubuntu:~/kernel/stgit.git$ stg version\nStacked GIT 0.14.3.285.g62874\ngit version 1.5.4.3\nPython version 2.5.2 (r252:60911, Jul 31 2008, 17:28:52) \n[GCC 4.2.3 (Ubuntu 4.2.3-2ubuntu7)]\nskuribay@ubuntu:~/kernel/stgit.git$ \n\nThanks,\n\n  Shinya\n"},{"id":"96652","messageId":"b0943d9e0811271406u6768f45csdb5ae775436404b8@mail.gmail.com","threadId":"16501","inReplyTo":"492EC5F5.2050807@ruby.dti.ne.jp","subject":"Re: [StGit] Import file(s) problem","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2008-11-27T22:06:01Z","receivedAt":"2008-11-27T22:06:01Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"2008/11/27 Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>:\n> Today I encountered a problem when importing a patch.  I don't know this\n> is a known issue or not. If there are good workarounds for this, I'd\n> like to know that.  Any comments are appreciated.\n>\n>\n> Steps to reproduce\n> -------------------\n>\n> 1. Prepare a patch, say stg-test.patch\n>\n> 2. Rename it to have '..' extension\n\nThe '..' construct has special meaning in both Git and StGit meaning\nan interval of commits or patches. We'll need to reject patch names\nwith '..' to avoid such errors.\n\n-- \nCatalin\n"},{"id":"96679","messageId":"20081128092556.GA4380@diana.vm.bytemark.co.uk","threadId":"16501","inReplyTo":"b0943d9e0811271406u6768f45csdb5ae775436404b8@mail.gmail.com","subject":"Re: [StGit] Import file(s) problem","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-11-28T09:25:56Z","receivedAt":"2008-11-28T09:25:56Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2008-11-27 22:06:01 +0000, Catalin Marinas wrote:\n\n> The '..' construct has special meaning in both Git and StGit meaning\n> an interval of commits or patches. We'll need to reject patch names\n> with '..' to avoid such errors.\n\nI added a note to the bug database:\n\n  https://gna.org/bugs/index.php?10919\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"96688","messageId":"49300ECB.5090401@ruby.dti.ne.jp","threadId":"16501","inReplyTo":"20081128092556.GA4380@diana.vm.bytemark.co.uk","subject":"Re: [StGit] Import file(s) problem","fromName":"Shinya Kuribayashi","fromEmail":"skuribay@ruby.dti.ne.jp","sentAt":"2008-11-28T15:31:23Z","receivedAt":"2008-11-28T15:31:23Z","isPatch":false,"sender":{"key":"skuribay@ruby.dti.ne.jp","avatar":null},"body":"Karl Hasselström wrote:\n> On 2008-11-27 22:06:01 +0000, Catalin Marinas wrote:\n> \n>> The '..' construct has special meaning in both Git and StGit meaning\n>> an interval of commits or patches. We'll need to reject patch names\n>> with '..' to avoid such errors.\n> \n> I added a note to the bug database:\n> \n>   https://gna.org/bugs/index.php?10919\n\nLooking forward to being fixed, thanks.\n\n  Shinya\n"}]}