prefer fixing commit hash on browsing files

Author: rhysd

src/page.rs

@@ -15,6 +15,7 @@ pub enum Page {
     },
     FileOrDir {
         relative_path: String,
+        hash: String,
     },
 }
 
@@ -53,8 +54,9 @@ impl<'a> BrowsePageParser<'a> {
     }
 
     fn try_parse_file_or_dir(&self) -> ParseResult {
-        if self.opts.args.len() != 1 {
-            return Err("  Invalid number of arguments for file or directory (1 is expected)".to_string());
+        let len = self.opts.args.len();
+        if len != 1 && len != 2 {
+            return Err("  Invalid number of arguments for file or directory (1..2 is expected)".to_string());
         }
 
         let path = &self.opts.args[0];
@@ -67,8 +69,14 @@ impl<'a> BrowsePageParser<'a> {
             .ok_or("  Failed to convert path into UTF-8 string")?
             .to_string();
 
+        let hash = if len == 2 {
+            self.git.hash(&self.opts.args[1].as_str())
+        } else {
+            self.git.hash(&"HEAD")
+        };
         Ok(Page::FileOrDir {
             relative_path: relative_path,
+            hash: hash?,
         })
     }
 }

src/service.rs

@@ -11,7 +11,7 @@ fn parse_github_url(user: &str, repo: &str, branch: &String, page: &Page) -> Str
         &Page::Open => format!("https://github.com/{}/{}/tree/{}", user, repo, branch),
         &Page::Diff {ref lhs, ref rhs} => format!("https://github.com/{}/{}/compare/{}...{}", user, repo, lhs, rhs),
         &Page::Commit {ref hash} => format!("https://github.com/{}/{}/commit/{}", user, repo, hash),
-        &Page::FileOrDir {ref relative_path} => format!("https://github.com/{}/{}/blob/{}/{}", user, repo, branch, relative_path),
+        &Page::FileOrDir {ref relative_path, ref hash} => format!("https://github.com/{}/{}/blob/{}/{}", user, repo, hash, relative_path),
     }
 }
 
@@ -20,7 +20,7 @@ fn parse_bitbucket_url(user: &str, repo: &str, branch: &String, page: &Page) ->
         &Page::Open => Ok(format!("https://bitbucket.org/{}/{}/branch/{}", user, repo, branch)),
         &Page::Diff {..} => Err("BitBucket does not support diff between commits (see https://bitbucket.org/site/master/issues/4779/ability-to-diff-between-any-two-commits)".to_string()),
         &Page::Commit {ref hash} => Ok(format!("https://bitbucket.org/{}/{}/commits/{}", user, repo, hash)),
-        &Page::FileOrDir {ref relative_path} => Err(format!("Not implemented! Cannot open file or directory {}. It needs commit hash", relative_path)),
+        &Page::FileOrDir {ref relative_path, ref hash} => Ok(format!("https://bitbucket.org/{}/{}/src/{}/{}", user, repo, hash, relative_path)),
     }
 }
 

src/util.rs

@@ -9,8 +9,8 @@ macro_rules! errorln(
 // Note:
 // string::String::insert_str() is not available because it's unstable.
 //   https://github.com/rust-lang/rust/issues/35553
-pub fn insert(target: &mut String, index: usize, replaced: &str) {
-    for c in replaced.chars().rev() {
+pub fn insert(target: &mut String, index: usize, inserted: &str) {
+    for c in inserted.chars().rev() {
         target.insert(index, c);
     }
 }