[Monotone-commits-diffs] net.venge.monotone: a69b014519d54982daf0ea0ab54999b3a4e292d3

[code]

revision:            a69b014519d54982daf0ea0ab54999b3a4e292d3
date:                2010-11-22T23:53:00
author:              address@hidden
branch:              net.venge.monotone
changelog:
* cmd_packet.cc: giving get_key_identity the key store sounds
  like a good idea...; remove some more dead code there - once
  we completed the key identity we know for sure that the key
  exists
* tests/dump_private_key: improve the tests by adding some more
  test cases and rely on a statically generated key for the test
* NEWS: note the fix

manifest:
format_version "1"

new_manifest [f860abd75d875c61f8431a8211f25a52a9a507b6]

old_revision [71bb9a1cd28d2709cc13375c4d0d722dcd05cc2e]

add_file "tests/dump_private_key/example.key"
 content [2e7149ba698b10fa0a876228e23874f8bdd7687c]

patch "NEWS"
 from [c2462806108dfa614009252583ddf883720be681]
   to [1dbf77ca29d6cd582a59583c9f057d0c881167bf]

patch "cmd_packet.cc"
 from [fc83584cf7ac45e2c0333b20e086c7ccfcceb248]
   to [31321e792e77dd18121f7689413777c23045537a]

patch "tests/dump_private_key/__driver__.lua"
 from [78da97d09c85b2928c29d95323345c29b9dd4d3c]
   to [ccf3eec371da6ee3f87636f0b017e004f06f6044]
============================================================
--- NEWS	c2462806108dfa614009252583ddf883720be681
+++ NEWS	1dbf77ca29d6cd582a59583c9f057d0c881167bf
@@ -6,19 +6,22 @@ XXX XXX XX XX:XX:XX UTC 2010
 
         - in 'mtn conflicts resolve_first interactive', the result
           file name now defaults to _MTN/resolutions/<left_path>.
-          Fixes monotone issue 103.
+          (fixes monotone issue 103)
 
         New Features
 
         - 'mtn conflicts store' now outputs a count of the conflicts,
-          and the name of the conflicts file. Fixes monotone issue
-          108.
+          and the name of the conflicts file. 
+          (fixes monotone issue 108)
         
         Bugs fixed
 
         - improve help, fix arg indexing in 'conflicts resolve_first'
           (fixes monotone issue 101)
         
+        - 'mtn privkey' did not recognize private keys solely available
+          in the key store. this has been fixed.
+
         - add compatibility with Botan 1.9.9 and newer
           (fixes monotone issue 104)
 
============================================================
--- cmd_packet.cc	fc83584cf7ac45e2c0333b20e086c7ccfcceb248
+++ cmd_packet.cc	31321e792e77dd18121f7689413777c23045537a
@@ -149,12 +149,10 @@ CMD(privkey, "privkey", "", CMD_REF(pack
     throw usage(execid);
 
   key_identity_info identity;
-  project.get_key_identity(app.lua,
+  project.get_key_identity(keys,
+                           app.lua,
                            typecast_vocab<external_key_name>(idx(args, 0)),
                            identity);
-  E(keys.key_pair_exists(identity.id), origin::user,
-    F("public and private key '%s' do not exist in keystore")
-    % idx(args, 0)());
 
   packet_writer pw(cout);
   keypair kp;
============================================================
--- tests/dump_private_key/__driver__.lua	78da97d09c85b2928c29d95323345c29b9dd4d3c
+++ tests/dump_private_key/__driver__.lua	ccf3eec371da6ee3f87636f0b017e004f06f6044
@@ -1,11 +1,23 @@
 
+check(get("example.key"))
+
 mtn_setup()
 
-check(mtn("au", "generate_key", "address@hidden", "bla"), 0, false, false)
+check(mtn("read"), 0, false, false, { "example.key" })
+
+-- fetch by name
 check(mtn("privkey", "address@hidden"), 0, true, false)
-check(qgrep("\\[keypair address@hidden", "stdout"))
+check(samefile("example.key", "stdout"))
 
--- check without a database or workspace
+-- fetch by id
+check(mtn("privkey", "d081c00cf730ee673d3d75e5a8262e2fec11a23f"), 0, true, false)
+check(samefile("example.key", "stdout"))
+
+-- fetch with absent database and workspace
 check(nodb_mtn("privkey", "--no-workspace", "address@hidden"), 0, true, false)
-check(qgrep("\\[keypair address@hidden", "stdout"))
+check(samefile("example.key", "stdout"))
 
+-- fetch non-existant key
+check(mtn("privkey", "blabla"), 1, false, true)
+check(qgrep("there is no key named 'blabla'", "stderr"))
+
============================================================
--- /dev/null	
+++ tests/dump_private_key/example.key	2e7149ba698b10fa0a876228e23874f8bdd7687c
@@ -0,0 +1,4 @@
+[keypair address@hidden
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/1lKw9RlaEXsDW8sD7BFQriFQQY9BerXWRr3YmEbvIRhY0yP2Fz5mly/BN4/httONBrmfu/yS6m3s/+YbvLdHvpn/sKwr1h9XD8PQTwbeRyerQbSqI92xRLcGOEmOil+paMP0MuQi61DRqeJlXANqJTpEoTqVV3DYWSqMIUh+tQIDAQAB#
+LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUNkd0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQW1Fd2dnSmRBZ0VBQW9HQkFML1dVckQxR1ZvUmV3TmIKeXdQc0VWQ3VJVkJCajBGNnRkWkd2ZGlZUnU4aEdGalRJL1lYUG1hWEw4RTNqK0cyMDQwR3VaKzcvSkxxYmV6Lwo1aHU4dDBlK21mK3dyQ3ZXSDFjUHc5QlBCdDVISjZ0QnRLb2ozYkZFdHdZNFNZNktYNmxvdy9ReTVDTHJVTkdwCjRtVmNBMm9sT2tTaE9wVlhjTmhaS293aFNINjFBZ01CQUFFQ2dZQWlucGZ2clZ1MDRHQzF1M1FJc2lweHgrcmwKSTkrcGJtNndTN1hwQjVvTmY0aDRSeW8vTi9TZjZQcktRSytyaVNYbVZtZGJSejZPZU5YN3BqYXRuTUhxVlQ3UgpyelRpS21EdU1ub0FnbFpHbDkrWnRlaWVoc1l2Q29pYUNBNlM4WWZxOHZrMlk0cUZER2VSU2hGZkowL3FyY3k0Ci9wMEh5SzU5UkcvQmQwMHRZUUpCQU1pa2hjN2VwcUp0d1BYOU04emdIV3VmMnJETXdQSDRvYVd4UTEvbVBEc04KSlI2UGxPTGtacVl3aFJYdkU3eGhsR3VIeHVRMy9tbkNrOHc3UnR5Njdua0NRUUQwdzkzTDdiNEQ4Ui91QVNtVgo4SjZuazlDMDM1YjBuM21mOEhpeUVBSW5teVgyTEhiQ2dVcTkyYzZGNlBJbkVOcXdOVFpOSCtPSnBzZVNXSEtYCmpKTWRBa0VBdHZtQ3BYTmExMG5yN09qcDhtNTNwZ3h6clVRc3VQNGF2RFg1MFZ6dmxKS2FSVkovWHFNWUVYcXkKQTV5eGpOd1lOQy93YTNPODZjbnVheE9ydmVRalVRSkJBS3RRUS9jdDZXYjg1Nm8vNmdsbUpzV0hzZlpHNEhOTApBMmVzZWUyM1FxclI3cG9FdVFLZVY5L1ZpTFUxTy9lWDFsaXFoZDBwU3FyWHJxdUJlSU1XQXdrQ1FIZWdHZ2ZKCi9ocUZzVDRuL2tZSnhTN0VjYmtzdjVSTUZMalBJeEdzbmNYOUdORjZHcHNSaG1uV1FNVm9tdytqQVlhZVpQZVMKd0haU3A2aUF6OHkvai9ZPQotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg==
+[end]